@nfdi4plants/arctrl 2.0.1 → 2.1.0-alpha.2

package/Json/OntologyAnnotation.js

@@ -1,58 +1,62 @@
-import { object, string, float, int, map, oneOf } from "../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
-import { equals, int32ToString } from "../fable_modules/fable-library-js.4.16.0/Util.js";
-import { choose, ofArray } from "../fable_modules/fable-library-js.4.16.0/List.js";
-import { Json } from "../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
-import { defaultSpaces, tryIncludeSeq, tryInclude } from "./Encode.js";
-import { Comment_ROCrate_decoderDisambiguatingDescription, Comment_ROCrate_encoderDisambiguatingDescription, Comment_decoder, Comment_encoder } from "./Comment.js";
+import { resizeArray, object, string, float, int, map, oneOf } from "../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
+import { int32ToString } from "../fable_modules/fable-library-js.4.22.0/Util.js";
+import { choose, ofArray } from "../fable_modules/fable-library-js.4.22.0/List.js";
+import { unwrap, map as map_1 } from "../fable_modules/fable-library-js.4.22.0/Option.js";
+import { tryIncludeSeq, tryInclude } from "./Encode.js";
+import { ROCrate_decoderDisambiguatingDescription, ROCrate_encoderDisambiguatingDescription, decoder, encoder } from "./Comment.js";
+import { filter, map as map_2 } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
 import { OntologyAnnotation } from "../Core/OntologyAnnotation.js";
-import { unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
-import { Decode_resizeArray } from "./Decode.js";
 import { decodeString, encodeString } from "./StringTable.js";
-import { printf, toText, replace } from "../fable_modules/fable-library-js.4.16.0/String.js";
+import { replace } from "../fable_modules/fable-library-js.4.22.0/String.js";
 import { URIModule_toString } from "../Core/URI.js";
 import { context_jsonvalue } from "./context/rocrate/isa_ontology_annotation_context.js";
 import { context_jsonvalue as context_jsonvalue_1 } from "./context/rocrate/property_value_context.js";
-import { filter } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { orderName } from "../Core/Process/ColumnIndex.js";
 import { encode } from "./IDTable.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";
 
 export const AnnotationValue_decoder = oneOf(ofArray([map(int32ToString, int), map((value_1) => value_1.toString(), float), string]));
 
 export function OntologyAnnotation_encoder(oa) {
-    return new Json(5, [choose((tupledArg) => {
-        const v = tupledArg[1];
-        if (equals(v, new Json(3, []))) {
-            return void 0;
-        }
-        else {
-            return [tupledArg[0], v];
-        }
-    }, ofArray([tryInclude("annotationValue", (value) => (new Json(0, [value])), oa.Name), tryInclude("termSource", (value_2) => (new Json(0, [value_2])), oa.TermSourceREF), tryInclude("termAccession", (value_4) => (new Json(0, [value_4])), oa.TermAccessionNumber), tryIncludeSeq("comments", Comment_encoder, oa.Comments)]))]);
+    const values = choose((tupledArg) => map_1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("annotationValue", (value) => ({
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    }), oa.Name), tryInclude("termSource", (value_2) => ({
+        Encode(helpers_1) {
+            return helpers_1.encodeString(value_2);
+        },
+    }), oa.TermSourceREF), tryInclude("termAccession", (value_4) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_4);
+        },
+    }), oa.TermAccessionNumber), tryIncludeSeq("comments", encoder, oa.Comments)]));
+    return {
+        Encode(helpers_3) {
+            const arg = map_2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values);
+            return helpers_3.encodeObject(arg);
+        },
+    };
 }
 
 export const OntologyAnnotation_decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3;
-    return OntologyAnnotation.create(unwrap((objectArg = get$.Optional, objectArg.Field("annotationValue", AnnotationValue_decoder))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("termSource", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("termAccession", string))), unwrap((arg_7 = Decode_resizeArray(Comment_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7)))));
+    return OntologyAnnotation.create(unwrap((objectArg = get$.Optional, objectArg.Field("annotationValue", AnnotationValue_decoder))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("termSource", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("termAccession", string))), unwrap((arg_7 = resizeArray(decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7)))));
 });
 
 export function OntologyAnnotation_compressedEncoder(stringTable, oa) {
-    return new Json(5, [choose((tupledArg) => {
-        const v = tupledArg[1];
-        if (equals(v, new Json(3, []))) {
-            return void 0;
-        }
-        else {
-            return [tupledArg[0], v];
-        }
-    }, ofArray([tryInclude("a", (s) => encodeString(stringTable, s), oa.Name), tryInclude("ts", (s_1) => encodeString(stringTable, s_1), oa.TermSourceREF), tryInclude("ta", (s_2) => encodeString(stringTable, s_2), oa.TermAccessionNumber), tryIncludeSeq("comments", Comment_encoder, oa.Comments)]))]);
+    const values = choose((tupledArg) => map_1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("a", (s) => encodeString(stringTable, s), oa.Name), tryInclude("ts", (s_1) => encodeString(stringTable, s_1), oa.TermSourceREF), tryInclude("ta", (s_2) => encodeString(stringTable, s_2), oa.TermAccessionNumber), tryIncludeSeq("comments", encoder, oa.Comments)]));
+    return {
+        Encode(helpers) {
+            const arg = map_2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers)], values);
+            return helpers.encodeObject(arg);
+        },
+    };
 }
 
 export function OntologyAnnotation_compressedDecoder(stringTable) {
     return object((get$) => {
         let arg_1, objectArg, arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3;
-        return new OntologyAnnotation(unwrap((arg_1 = decodeString(stringTable), (objectArg = get$.Optional, objectArg.Field("a", arg_1)))), unwrap((arg_3 = decodeString(stringTable), (objectArg_1 = get$.Optional, objectArg_1.Field("ts", arg_3)))), unwrap((arg_5 = decodeString(stringTable), (objectArg_2 = get$.Optional, objectArg_2.Field("ta", arg_5)))), unwrap((arg_7 = Decode_resizeArray(Comment_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7)))));
+        return new OntologyAnnotation(unwrap((arg_1 = decodeString(stringTable), (objectArg = get$.Optional, objectArg.Field("a", arg_1)))), unwrap((arg_3 = decodeString(stringTable), (objectArg_1 = get$.Optional, objectArg_1.Field("ts", arg_3)))), unwrap((arg_5 = decodeString(stringTable), (objectArg_2 = get$.Optional, objectArg_2.Field("ta", arg_5)))), unwrap((arg_7 = resizeArray(decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7)))));
     });
 }
 
@@ -79,37 +83,71 @@ export function OntologyAnnotation_ROCrate_genID(o) {
 }
 
 export function OntologyAnnotation_ROCrate_encoderDefinedTerm(oa) {
-    return new Json(5, [choose((tupledArg) => {
-        const v = tupledArg[1];
-        if (equals(v, new Json(3, []))) {
-            return void 0;
-        }
-        else {
-            return [tupledArg[0], v];
-        }
-    }, ofArray([["@id", new Json(0, [OntologyAnnotation_ROCrate_genID(oa)])], ["@type", new Json(0, ["OntologyAnnotation"])], tryInclude("annotationValue", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("termSource", (value_4) => (new Json(0, [value_4])), oa.TermSourceREF), tryInclude("termAccession", (value_6) => (new Json(0, [value_6])), oa.TermAccessionNumber), tryIncludeSeq("comments", Comment_ROCrate_encoderDisambiguatingDescription, oa.Comments), ["@context", context_jsonvalue]]))]);
+    let value;
+    const values = choose((tupledArg) => map_1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = OntologyAnnotation_ROCrate_genID(oa), {
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    })], ["@type", {
+        Encode(helpers_1) {
+            return helpers_1.encodeString("OntologyAnnotation");
+        },
+    }], tryInclude("annotationValue", (value_2) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_2);
+        },
+    }), oa.Name), tryInclude("termSource", (value_4) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_4);
+        },
+    }), oa.TermSourceREF), tryInclude("termAccession", (value_6) => ({
+        Encode(helpers_4) {
+            return helpers_4.encodeString(value_6);
+        },
+    }), oa.TermAccessionNumber), tryIncludeSeq("comments", ROCrate_encoderDisambiguatingDescription, oa.Comments), ["@context", context_jsonvalue]]));
+    return {
+        Encode(helpers_5) {
+            const arg = map_2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_5)], values);
+            return helpers_5.encodeObject(arg);
+        },
+    };
 }
 
 export const OntologyAnnotation_ROCrate_decoderDefinedTerm = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3;
-    return OntologyAnnotation.create(unwrap((objectArg = get$.Optional, objectArg.Field("annotationValue", AnnotationValue_decoder))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("termSource", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("termAccession", string))), unwrap((arg_7 = Decode_resizeArray(Comment_ROCrate_decoderDisambiguatingDescription), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7)))));
+    return OntologyAnnotation.create(unwrap((objectArg = get$.Optional, objectArg.Field("annotationValue", AnnotationValue_decoder))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("termSource", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("termAccession", string))), unwrap((arg_7 = resizeArray(ROCrate_decoderDisambiguatingDescription), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7)))));
 });
 
 export function OntologyAnnotation_ROCrate_encoderPropertyValue(oa) {
-    return new Json(5, [choose((tupledArg) => {
-        const v = tupledArg[1];
-        if (equals(v, new Json(3, []))) {
-            return void 0;
-        }
-        else {
-            return [tupledArg[0], v];
-        }
-    }, ofArray([["@id", new Json(0, [OntologyAnnotation_ROCrate_genID(oa)])], ["@type", new Json(0, ["PropertyValue"])], tryInclude("category", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("categoryCode", (value_4) => (new Json(0, [value_4])), oa.TermAccessionNumber), tryIncludeSeq("comments", Comment_ROCrate_encoderDisambiguatingDescription, oa.Comments), ["@context", context_jsonvalue_1]]))]);
+    let value;
+    const values = choose((tupledArg) => map_1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = OntologyAnnotation_ROCrate_genID(oa), {
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    })], ["@type", {
+        Encode(helpers_1) {
+            return helpers_1.encodeString("PropertyValue");
+        },
+    }], tryInclude("category", (value_2) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_2);
+        },
+    }), oa.Name), tryInclude("categoryCode", (value_4) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_4);
+        },
+    }), oa.TermAccessionNumber), tryIncludeSeq("comments", ROCrate_encoderDisambiguatingDescription, oa.Comments), ["@context", context_jsonvalue_1]]));
+    return {
+        Encode(helpers_4) {
+            const arg = map_2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values);
+            return helpers_4.encodeObject(arg);
+        },
+    };
 }
 
 export const OntologyAnnotation_ROCrate_decoderPropertyValue = object((get$) => {
     let objectArg, objectArg_1, arg_5, objectArg_2;
-    return OntologyAnnotation.create(unwrap((objectArg = get$.Optional, objectArg.Field("category", string))), void 0, unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("categoryCode", string))), unwrap((arg_5 = Decode_resizeArray(Comment_ROCrate_decoderDisambiguatingDescription), (objectArg_2 = get$.Optional, objectArg_2.Field("comments", arg_5)))));
+    return OntologyAnnotation.create(unwrap((objectArg = get$.Optional, objectArg.Field("category", string))), undefined, unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("categoryCode", string))), unwrap((arg_5 = resizeArray(ROCrate_decoderDisambiguatingDescription), (objectArg_2 = get$.Optional, objectArg_2.Field("comments", arg_5)))));
 });
 
 export function OntologyAnnotation_ISAJson_encoder(idMap, oa) {
@@ -136,15 +174,29 @@ export function OntologyAnnotation_ISAJson_encoder(idMap, oa) {
                     return true;
             }
         }, oa_1.Comments);
-        return new Json(5, [choose((tupledArg) => {
-            const v = tupledArg[1];
-            if (equals(v, new Json(3, []))) {
-                return void 0;
-            }
-            else {
-                return [tupledArg[0], v];
-            }
-        }, ofArray([tryInclude("@id", (value) => (new Json(0, [value])), OntologyAnnotation_ROCrate_genID(oa_1)), tryInclude("annotationValue", (value_2) => (new Json(0, [value_2])), oa_1.Name), tryInclude("termSource", (value_4) => (new Json(0, [value_4])), oa_1.TermSourceREF), tryInclude("termAccession", (value_6) => (new Json(0, [value_6])), oa_1.TermAccessionNumber), tryIncludeSeq("comments", Comment_encoder, comments)]))]);
+        const values = choose((tupledArg) => map_1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value) => ({
+            Encode(helpers) {
+                return helpers.encodeString(value);
+            },
+        }), OntologyAnnotation_ROCrate_genID(oa_1)), tryInclude("annotationValue", (value_2) => ({
+            Encode(helpers_1) {
+                return helpers_1.encodeString(value_2);
+            },
+        }), oa_1.Name), tryInclude("termSource", (value_4) => ({
+            Encode(helpers_2) {
+                return helpers_2.encodeString(value_4);
+            },
+        }), oa_1.TermSourceREF), tryInclude("termAccession", (value_6) => ({
+            Encode(helpers_3) {
+                return helpers_3.encodeString(value_6);
+            },
+        }), oa_1.TermAccessionNumber), tryIncludeSeq("comments", encoder, comments)]));
+        return {
+            Encode(helpers_4) {
+                const arg = map_2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values);
+                return helpers_4.encodeObject(arg);
+            },
+        };
     };
     if (idMap != null) {
         return encode(OntologyAnnotation_ROCrate_genID, f, oa, idMap);
@@ -156,69 +208,3 @@ export function OntologyAnnotation_ISAJson_encoder(idMap, oa) {
 
 export const OntologyAnnotation_ISAJson_decoder = OntologyAnnotation_decoder;
 
-export function ARCtrl_OntologyAnnotation__OntologyAnnotation_fromJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(OntologyAnnotation_decoder, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-export function ARCtrl_OntologyAnnotation__OntologyAnnotation_toJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = OntologyAnnotation_encoder(obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_OntologyAnnotation__OntologyAnnotation_ToJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_OntologyAnnotation__OntologyAnnotation_toJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-
-export function ARCtrl_OntologyAnnotation__OntologyAnnotation_fromROCrateJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(OntologyAnnotation_ROCrate_decoderDefinedTerm, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-/**
- * exports in json-ld format
- */
-export function ARCtrl_OntologyAnnotation__OntologyAnnotation_toROCrateJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = OntologyAnnotation_ROCrate_encoderDefinedTerm(obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_OntologyAnnotation__OntologyAnnotation_ToROCrateJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_OntologyAnnotation__OntologyAnnotation_toROCrateJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-
-export function ARCtrl_OntologyAnnotation__OntologyAnnotation_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(OntologyAnnotation_ISAJson_decoder, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-export function ARCtrl_OntologyAnnotation__OntologyAnnotation_toISAJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = OntologyAnnotation_ISAJson_encoder(void 0, obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_OntologyAnnotation__OntologyAnnotation_ToISAJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_OntologyAnnotation__OntologyAnnotation_toISAJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-

package/Json/OntologySourceReference.js

@@ -1,35 +1,46 @@
-import { ofArray, choose } from "../fable_modules/fable-library-js.4.16.0/List.js";
-import { equals } from "../fable_modules/fable-library-js.4.16.0/Util.js";
-import { Json } from "../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
-import { defaultSpaces, tryIncludeSeq, tryInclude } from "./Encode.js";
-import { Comment_ISAJson_encoder, Comment_decoder, Comment_encoder } from "./Comment.js";
-import { string, object } from "../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { ofArray, choose } from "../fable_modules/fable-library-js.4.22.0/List.js";
+import { unwrap, map } from "../fable_modules/fable-library-js.4.22.0/Option.js";
+import { tryIncludeSeq, tryInclude } from "./Encode.js";
+import { ISAJson_encoder as ISAJson_encoder_1, decoder as decoder_1, encoder as encoder_1 } from "./Comment.js";
+import { map as map_1 } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
+import { string, object } from "../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { OntologySourceReference } from "../Core/OntologySourceReference.js";
-import { unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
 import { Decode_resizeArray, Decode_uri } from "./Decode.js";
-import { printf, toText, replace } from "../fable_modules/fable-library-js.4.16.0/String.js";
+import { replace } from "../fable_modules/fable-library-js.4.22.0/String.js";
 import { context_jsonvalue } from "./context/rocrate/isa_ontology_source_reference_context.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";
 
-export function OntologySourceReference_encoder(osr) {
-    return new Json(5, [choose((tupledArg) => {
-        const v = tupledArg[1];
-        if (equals(v, new Json(3, []))) {
-            return void 0;
-        }
-        else {
-            return [tupledArg[0], v];
-        }
-    }, ofArray([tryInclude("description", (value) => (new Json(0, [value])), osr.Description), tryInclude("file", (value_2) => (new Json(0, [value_2])), osr.File), tryInclude("name", (value_4) => (new Json(0, [value_4])), osr.Name), tryInclude("version", (value_6) => (new Json(0, [value_6])), osr.Version), tryIncludeSeq("comments", Comment_encoder, osr.Comments)]))]);
+export function encoder(osr) {
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("description", (value) => ({
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    }), osr.Description), tryInclude("file", (value_2) => ({
+        Encode(helpers_1) {
+            return helpers_1.encodeString(value_2);
+        },
+    }), osr.File), tryInclude("name", (value_4) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_4);
+        },
+    }), osr.Name), tryInclude("version", (value_6) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_6);
+        },
+    }), osr.Version), tryIncludeSeq("comments", encoder_1, osr.Comments)]));
+    return {
+        Encode(helpers_4) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values);
+            return helpers_4.encodeObject(arg);
+        },
+    };
 }
 
-export const OntologySourceReference_decoder = object((get$) => {
+export const decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, arg_9, objectArg_4;
-    return new OntologySourceReference(unwrap((objectArg = get$.Optional, objectArg.Field("description", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("file", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("name", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("version", string))), unwrap((arg_9 = Decode_resizeArray(Comment_decoder), (objectArg_4 = get$.Optional, objectArg_4.Field("comments", arg_9)))));
+    return new OntologySourceReference(unwrap((objectArg = get$.Optional, objectArg.Field("description", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("file", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("name", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("version", string))), unwrap((arg_9 = Decode_resizeArray(decoder_1), (objectArg_4 = get$.Optional, objectArg_4.Field("comments", arg_9)))));
 });
 
-export function OntologySourceReference_ROCrate_genID(o) {
+export function ROCrate_genID(o) {
     const matchValue = o.File;
     if (matchValue == null) {
         const matchValue_1 = o.Name;
@@ -45,100 +56,71 @@ export function OntologySourceReference_ROCrate_genID(o) {
     }
 }
 
-export function OntologySourceReference_ROCrate_encoder(osr) {
-    return new Json(5, [choose((tupledArg) => {
-        const v = tupledArg[1];
-        if (equals(v, new Json(3, []))) {
-            return void 0;
-        }
-        else {
-            return [tupledArg[0], v];
-        }
-    }, ofArray([["@id", new Json(0, [OntologySourceReference_ROCrate_genID(osr)])], ["@type", new Json(0, ["OntologySourceReference"])], tryInclude("description", (value_2) => (new Json(0, [value_2])), osr.Description), tryInclude("file", (value_4) => (new Json(0, [value_4])), osr.File), tryInclude("name", (value_6) => (new Json(0, [value_6])), osr.Name), tryInclude("version", (value_8) => (new Json(0, [value_8])), osr.Version), tryIncludeSeq("comments", Comment_encoder, osr.Comments), ["@context", context_jsonvalue]]))]);
+export function ROCrate_encoder(osr) {
+    let value;
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(osr), {
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    })], ["@type", {
+        Encode(helpers_1) {
+            return helpers_1.encodeString("OntologySourceReference");
+        },
+    }], tryInclude("description", (value_2) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_2);
+        },
+    }), osr.Description), tryInclude("file", (value_4) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_4);
+        },
+    }), osr.File), tryInclude("name", (value_6) => ({
+        Encode(helpers_4) {
+            return helpers_4.encodeString(value_6);
+        },
+    }), osr.Name), tryInclude("version", (value_8) => ({
+        Encode(helpers_5) {
+            return helpers_5.encodeString(value_8);
+        },
+    }), osr.Version), tryIncludeSeq("comments", encoder_1, osr.Comments), ["@context", context_jsonvalue]]));
+    return {
+        Encode(helpers_6) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values);
+            return helpers_6.encodeObject(arg);
+        },
+    };
 }
 
-export const OntologySourceReference_ROCrate_decoder = object((get$) => {
+export const ROCrate_decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, arg_9, objectArg_4;
-    return new OntologySourceReference(unwrap((objectArg = get$.Optional, objectArg.Field("description", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("file", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("name", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("version", string))), unwrap((arg_9 = Decode_resizeArray(Comment_decoder), (objectArg_4 = get$.Optional, objectArg_4.Field("comments", arg_9)))));
+    return new OntologySourceReference(unwrap((objectArg = get$.Optional, objectArg.Field("description", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("file", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("name", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("version", string))), unwrap((arg_9 = Decode_resizeArray(decoder_1), (objectArg_4 = get$.Optional, objectArg_4.Field("comments", arg_9)))));
 });
 
-export function OntologySourceReference_ISAJson_encoder(idMap, osr) {
-    return new Json(5, [choose((tupledArg) => {
-        const v = tupledArg[1];
-        if (equals(v, new Json(3, []))) {
-            return void 0;
-        }
-        else {
-            return [tupledArg[0], v];
-        }
-    }, ofArray([tryInclude("description", (value) => (new Json(0, [value])), osr.Description), tryInclude("file", (value_2) => (new Json(0, [value_2])), osr.File), tryInclude("name", (value_4) => (new Json(0, [value_4])), osr.Name), tryInclude("version", (value_6) => (new Json(0, [value_6])), osr.Version), tryIncludeSeq("comments", (comment) => Comment_ISAJson_encoder(idMap, comment), osr.Comments)]))]);
-}
-
-export const OntologySourceReference_ISAJson_decoder = OntologySourceReference_decoder;
-
-export function ARCtrl_OntologySourceReference__OntologySourceReference_fromJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(OntologySourceReference_decoder, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-export function ARCtrl_OntologySourceReference__OntologySourceReference_toJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = OntologySourceReference_encoder(obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_OntologySourceReference__OntologySourceReference_ToJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_OntologySourceReference__OntologySourceReference_toJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-
-export function ARCtrl_OntologySourceReference__OntologySourceReference_fromROCrateJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(OntologySourceReference_ROCrate_decoder, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-/**
- * exports in json-ld format
- */
-export function ARCtrl_OntologySourceReference__OntologySourceReference_toROCrateJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = OntologySourceReference_ROCrate_encoder(obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_OntologySourceReference__OntologySourceReference_ToROCrateJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_OntologySourceReference__OntologySourceReference_toROCrateJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-
-export function ARCtrl_OntologySourceReference__OntologySourceReference_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(OntologySourceReference_ISAJson_decoder, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-export function ARCtrl_OntologySourceReference__OntologySourceReference_toISAJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = OntologySourceReference_ISAJson_encoder(void 0, obj);
-        return toString(defaultSpaces(spaces), value);
+export function ISAJson_encoder(idMap, osr) {
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("description", (value) => ({
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    }), osr.Description), tryInclude("file", (value_2) => ({
+        Encode(helpers_1) {
+            return helpers_1.encodeString(value_2);
+        },
+    }), osr.File), tryInclude("name", (value_4) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_4);
+        },
+    }), osr.Name), tryInclude("version", (value_6) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_6);
+        },
+    }), osr.Version), tryIncludeSeq("comments", (comment) => ISAJson_encoder_1(idMap, comment), osr.Comments)]));
+    return {
+        Encode(helpers_4) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_4)], values);
+            return helpers_4.encodeObject(arg);
+        },
     };
 }
 
-export function ARCtrl_OntologySourceReference__OntologySourceReference_ToISAJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_OntologySourceReference__OntologySourceReference_toISAJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
+export const ISAJson_decoder = decoder;