@nfdi4plants/arctrl 1.0.7 → 1.2.0

package/ISA/ISA.Json/Factor.js

@@ -1,71 +1,73 @@
-import { Value } from "../ISA/JsonTypes/Value.js";
+import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
 import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "./Ontology.js";
-import { object as object_8, toString, nil } from "../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
-import { array, object as object_9, string, float, int } from "../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
-import { FSharpResult$2 } from "../../fable_modules/fable-library.4.5.0/Choice.js";
-import { uri, fromJsonString } from "./Decode.js";
-import { equals, uncurry2 } from "../../fable_modules/fable-library.4.5.0/Util.js";
-import { ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions__get_IncludeType, ConverterOptions__get_SetID, ConverterOptions_$ctor } from "./ConverterOptions.js";
-import { replace } from "../../fable_modules/fable-library.4.5.0/String.js";
+import { array, object, string, float, int } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { FSharpResult$2 } from "../../fable_modules/fable-library-js.4.13.0/Result.js";
+import { Value } from "../ISA/JsonTypes/Value.js";
+import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
+import { ConverterOptions__set_IncludeContext_Z1FBCCD16, ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions__get_IncludeContext, ConverterOptions__get_IncludeType, ConverterOptions__get_SetID, ConverterOptions_$ctor } from "./ConverterOptions.js";
+import { replace, printf, toText } from "../../fable_modules/fable-library-js.4.13.0/String.js";
+import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
 import { URIModule_toString } from "../ISA/JsonTypes/URI.js";
-import { choose } from "../../fable_modules/fable-library.4.5.0/List.js";
-import { empty, singleton, append, delay, toList } from "../../fable_modules/fable-library.4.5.0/Seq.js";
-import { tryInclude } from "./GEncode.js";
+import { ofArray, choose } 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 { empty, singleton, append, delay, toList } from "../../fable_modules/fable-library-js.4.13.0/Seq.js";
+import { tryIncludeArray, tryInclude } from "./GEncode.js";
+import { list as list_1 } from "../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
 import { decoder as decoder_1, encoder } from "./Comment.js";
+import { context_jsonvalue } from "./context/rocrate/isa_factor_context.js";
+import { uri } from "./Decode.js";
 import { Factor } from "../ISA/JsonTypes/Factor.js";
+import { context_jsonvalue as context_jsonvalue_1 } from "./context/rocrate/isa_factor_value_context.js";
 import { FactorValue } from "../ISA/JsonTypes/FactorValue.js";
 
 export function Value_encoder(options, value) {
-    if (value instanceof Value) {
-        if (value.tag === 1) {
-            return value.fields[0];
-        }
-        else if (value.tag === 3) {
-            return value.fields[0];
-        }
-        else if (value.tag === 0) {
+    switch (value.tag) {
+        case 1:
+            return new Json(7, [value.fields[0] >>> 0]);
+        case 3:
+            return new Json(0, [value.fields[0]]);
+        case 0:
             return OntologyAnnotation_encoder(options, value.fields[0]);
-        }
-        else {
-            return value.fields[0];
-        }
-    }
-    else {
-        return nil;
+        default:
+            return new Json(2, [value.fields[0]]);
     }
 }
 
-export function Value_decoder(options, s, json) {
-    const matchValue = int(s)(json);
-    if (matchValue.tag === 1) {
-        const matchValue_1 = float(s, json);
-        if (matchValue_1.tag === 1) {
-            const matchValue_2 = OntologyAnnotation_decoder(options)(s)(json);
-            if (matchValue_2.tag === 1) {
-                const matchValue_3 = string(s, json);
-                if (matchValue_3.tag === 1) {
-                    return new FSharpResult$2(1, [matchValue_3.fields[0]]);
+export function Value_decoder(options) {
+    return {
+        Decode(s, json) {
+            const matchValue = int.Decode(s, json);
+            if (matchValue.tag === 1) {
+                const matchValue_1 = float.Decode(s, json);
+                if (matchValue_1.tag === 1) {
+                    const matchValue_2 = OntologyAnnotation_decoder(options).Decode(s, json);
+                    if (matchValue_2.tag === 1) {
+                        const matchValue_3 = string.Decode(s, json);
+                        return (matchValue_3.tag === 1) ? (new FSharpResult$2(1, [matchValue_3.fields[0]])) : (new FSharpResult$2(0, [new Value(3, [matchValue_3.fields[0]])]));
+                    }
+                    else {
+                        return new FSharpResult$2(0, [new Value(0, [matchValue_2.fields[0]])]);
+                    }
                 }
                 else {
-                    return new FSharpResult$2(0, [new Value(3, [matchValue_3.fields[0]])]);
+                    return new FSharpResult$2(0, [new Value(2, [matchValue_1.fields[0]])]);
                 }
             }
             else {
-                return new FSharpResult$2(0, [new Value(0, [matchValue_2.fields[0]])]);
+                return new FSharpResult$2(0, [new Value(1, [matchValue.fields[0]])]);
             }
-        }
-        else {
-            return new FSharpResult$2(0, [new Value(2, [matchValue_1.fields[0]])]);
-        }
-    }
-    else {
-        return new FSharpResult$2(0, [new Value(1, [matchValue.fields[0]])]);
-    }
+        },
+    };
 }
 
 export function Value_fromJsonString(s) {
-    let options;
-    return fromJsonString(uncurry2((options = ConverterOptions_$ctor(), (s_1) => ((json) => Value_decoder(options, s_1, json)))), s);
+    const matchValue = fromString(Value_decoder(ConverterOptions_$ctor()), s);
+    if (matchValue.tag === 1) {
+        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+    }
+    else {
+        return matchValue.fields[0];
+    }
 }
 
 export function Value_toJsonString(v) {
@@ -89,40 +91,32 @@ export function Factor_genID(f) {
 }
 
 export function Factor_encoder(options, oa) {
-    return object_8(choose((tupledArg) => {
+    return new Json(5, [choose((tupledArg) => {
         const v = tupledArg[1];
-        if (equals(v, nil)) {
+        if (equals(v, new Json(3, []))) {
             return void 0;
         }
         else {
             return [tupledArg[0], v];
         }
-    }, toList(delay(() => {
-        let value, s;
-        return append(ConverterOptions__get_SetID(options) ? singleton(["@id", (value = Factor_genID(oa), (typeof value === "string") ? ((s = value, s)) : nil)]) : singleton(tryInclude("@id", (value_2) => {
-            let s_1;
-            const value_3 = value_2;
-            return (typeof value_3 === "string") ? ((s_1 = value_3, s_1)) : nil;
-        }, oa["ID"])), delay(() => {
-            let value_5, s_2;
-            return append(ConverterOptions__get_IncludeType(options) ? singleton(["@type", (value_5 = "Factor", (typeof value_5 === "string") ? ((s_2 = value_5, s_2)) : nil)]) : empty(), delay(() => append(singleton(tryInclude("factorName", (value_7) => {
-                let s_3;
-                const value_8 = value_7;
-                return (typeof value_8 === "string") ? ((s_3 = value_8, s_3)) : nil;
-            }, oa["Name"])), delay(() => append(singleton(tryInclude("factorType", (oa_1) => OntologyAnnotation_encoder(options, oa_1), oa["FactorType"])), delay(() => singleton(tryInclude("comments", (comment) => encoder(options, comment), oa["Comments"]))))))));
-        }));
-    }))));
+    }, toList(delay(() => append(ConverterOptions__get_SetID(options) ? singleton(["@id", new Json(0, [Factor_genID(oa)])]) : singleton(tryInclude("@id", (value_1) => (new Json(0, [value_1])), oa.ID)), delay(() => append(ConverterOptions__get_IncludeType(options) ? singleton(["@type", list_1(ofArray([new Json(0, ["Factor"]), new Json(0, ["ArcFactor"])]))]) : empty(), delay(() => append(singleton(tryInclude("factorName", (value_5) => (new Json(0, [value_5])), oa.Name)), delay(() => append(singleton(tryInclude("factorType", (oa_1) => OntologyAnnotation_encoder(options, oa_1), oa.FactorType)), delay(() => append(singleton(tryIncludeArray("comments", (comment) => encoder(options, comment), oa.Comments)), delay(() => (ConverterOptions__get_IncludeContext(options) ? singleton(["@context", context_jsonvalue]) : empty()))))))))))))))]);
 }
 
 export function Factor_decoder(options) {
-    return (path_2) => ((v) => object_9((get$) => {
-        let objectArg, objectArg_1, arg_5, objectArg_2, arg_7, decoder, objectArg_3;
-        return new Factor((objectArg = get$.Optional, objectArg.Field("@id", uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("factorName", string)), (arg_5 = OntologyAnnotation_decoder(options), (objectArg_2 = get$.Optional, objectArg_2.Field("factorType", uncurry2(arg_5)))), (arg_7 = ((decoder = decoder_1(options), (path_1) => ((value_1) => array(uncurry2(decoder), path_1, value_1)))), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", uncurry2(arg_7)))));
-    }, path_2, v));
+    return object((get$) => {
+        let objectArg, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3;
+        return new Factor((objectArg = get$.Optional, objectArg.Field("@id", uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("factorName", string)), (arg_5 = OntologyAnnotation_decoder(options), (objectArg_2 = get$.Optional, objectArg_2.Field("factorType", arg_5))), (arg_7 = array(decoder_1(options)), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7))));
+    });
 }
 
 export function Factor_fromJsonString(s) {
-    return fromJsonString(uncurry2(Factor_decoder(ConverterOptions_$ctor())), s);
+    const matchValue = fromString(Factor_decoder(ConverterOptions_$ctor()), s);
+    if (matchValue.tag === 1) {
+        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+    }
+    else {
+        return matchValue.fields[0];
+    }
 }
 
 export function Factor_toJsonString(f) {
@@ -132,11 +126,16 @@ export function Factor_toJsonString(f) {
 /**
  * exports in json-ld format
  */
-export function Factor_toStringLD(f) {
+export function Factor_toJsonldString(f) {
     let returnVal;
     return toString(2, Factor_encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), f));
 }
 
+export function Factor_toJsonldStringWithContext(a) {
+    let returnVal;
+    return toString(2, Factor_encoder((returnVal = ConverterOptions_$ctor(), (((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), ConverterOptions__set_IncludeContext_Z1FBCCD16(returnVal, true)), returnVal)), a));
+}
+
 export function FactorValue_genID(fv) {
     const matchValue = fv.ID;
     if (matchValue == null) {
@@ -148,36 +147,32 @@ export function FactorValue_genID(fv) {
 }
 
 export function FactorValue_encoder(options, oa) {
-    return object_8(choose((tupledArg) => {
+    return new Json(5, [choose((tupledArg) => {
         const v = tupledArg[1];
-        if (equals(v, nil)) {
+        if (equals(v, new Json(3, []))) {
             return void 0;
         }
         else {
             return [tupledArg[0], v];
         }
-    }, toList(delay(() => {
-        let value, s;
-        return append(ConverterOptions__get_SetID(options) ? singleton(["@id", (value = FactorValue_genID(oa), (typeof value === "string") ? ((s = value, s)) : nil)]) : singleton(tryInclude("@id", (value_2) => {
-            let s_1;
-            const value_3 = value_2;
-            return (typeof value_3 === "string") ? ((s_1 = value_3, s_1)) : nil;
-        }, oa["ID"])), delay(() => {
-            let value_5, s_2;
-            return append(ConverterOptions__get_IncludeType(options) ? singleton(["@type", (value_5 = "FactorValue", (typeof value_5 === "string") ? ((s_2 = value_5, s_2)) : nil)]) : empty(), delay(() => append(singleton(tryInclude("category", (oa_1) => Factor_encoder(options, oa_1), oa["Category"])), delay(() => append(singleton(tryInclude("value", (value_7) => Value_encoder(options, value_7), oa["Value"])), delay(() => singleton(tryInclude("unit", (oa_2) => OntologyAnnotation_encoder(options, oa_2), oa["Unit"]))))))));
-        }));
-    }))));
+    }, toList(delay(() => append(ConverterOptions__get_SetID(options) ? singleton(["@id", new Json(0, [FactorValue_genID(oa)])]) : singleton(tryInclude("@id", (value_1) => (new Json(0, [value_1])), oa.ID)), delay(() => append(ConverterOptions__get_IncludeType(options) ? singleton(["@type", list_1(ofArray([new Json(0, ["FactorValue"]), new Json(0, ["ArcFactorValue"])]))]) : empty(), delay(() => append(singleton(tryInclude("category", (oa_1) => Factor_encoder(options, oa_1), oa.Category)), delay(() => append(singleton(tryInclude("value", (value_5) => Value_encoder(options, value_5), oa.Value)), delay(() => append(singleton(tryInclude("unit", (oa_2) => OntologyAnnotation_encoder(options, oa_2), oa.Unit)), delay(() => (ConverterOptions__get_IncludeContext(options) ? singleton(["@context", context_jsonvalue_1]) : empty()))))))))))))))]);
 }
 
 export function FactorValue_decoder(options) {
-    return (path) => ((v) => object_9((get$) => {
-        let objectArg, arg_3, objectArg_1, objectArg_2, arg_7, objectArg_3;
-        return new FactorValue((objectArg = get$.Optional, objectArg.Field("@id", uri)), (arg_3 = Factor_decoder(options), (objectArg_1 = get$.Optional, objectArg_1.Field("category", uncurry2(arg_3)))), (objectArg_2 = get$.Optional, objectArg_2.Field("value", (s_1, json_1) => Value_decoder(options, s_1, json_1))), (arg_7 = OntologyAnnotation_decoder(options), (objectArg_3 = get$.Optional, objectArg_3.Field("unit", uncurry2(arg_7)))));
-    }, path, v));
+    return object((get$) => {
+        let objectArg, arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3;
+        return new FactorValue((objectArg = get$.Optional, objectArg.Field("@id", uri)), (arg_3 = Factor_decoder(options), (objectArg_1 = get$.Optional, objectArg_1.Field("category", arg_3))), (arg_5 = Value_decoder(options), (objectArg_2 = get$.Optional, objectArg_2.Field("value", arg_5))), (arg_7 = OntologyAnnotation_decoder(options), (objectArg_3 = get$.Optional, objectArg_3.Field("unit", arg_7))));
+    });
 }
 
 export function FactorValue_fromJsonString(s) {
-    return fromJsonString(uncurry2(FactorValue_decoder(ConverterOptions_$ctor())), s);
+    const matchValue = fromString(FactorValue_decoder(ConverterOptions_$ctor()), s);
+    if (matchValue.tag === 1) {
+        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+    }
+    else {
+        return matchValue.fields[0];
+    }
 }
 
 export function FactorValue_toJsonString(f) {
@@ -187,8 +182,13 @@ export function FactorValue_toJsonString(f) {
 /**
  * exports in json-ld format
  */
-export function FactorValue_toStringLD(f) {
+export function FactorValue_toJsonldString(f) {
     let returnVal;
     return toString(2, FactorValue_encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), f));
 }
 
+export function FactorValue_toJsonldStringWithContext(a) {
+    let returnVal;
+    return toString(2, FactorValue_encoder((returnVal = ConverterOptions_$ctor(), (((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), ConverterOptions__set_IncludeContext_Z1FBCCD16(returnVal, true)), returnVal)), a));
+}
+

package/ISA/ISA.Json/GEncode.js

@@ -1,15 +1,40 @@
-import { value as value_1 } from "../../fable_modules/fable-library.4.5.0/Option.js";
-import { isIterable } from "../../fable_modules/fable-library.4.5.0/Util.js";
-import { nil, seq } from "../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
-import { map } from "../../fable_modules/fable-library.4.5.0/Seq.js";
+import { value as value_1 } from "../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { isIterable } from "../../fable_modules/fable-library-js.4.13.0/Util.js";
+import { list as list_1, seq } from "../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
+import { map } 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 } from "../../fable_modules/fable-library-js.4.13.0/Array.js";
+import { map as map_2 } from "../../fable_modules/fable-library-js.4.13.0/List.js";
 
 /**
  * Try to encode the given object using the given encoder, or return Encode.nil if the object is null
  * 
  * If the object is a sequence, encode each element using the given encoder and return the resulting sequence
  */
-export function tryInclude(name, encoder, value) {
+export function tryIncludeObj(name, encoder, value) {
     let v, o;
-    return [name, (value != null) ? (isIterable(value_1(value)) ? ((v = value_1(value), seq(map(encoder, v)))) : ((o = value_1(value), encoder(o)))) : nil];
+    return [name, (value != null) ? (isIterable(value_1(value)) ? ((v = value_1(value), seq(map(encoder, v)))) : ((o = value_1(value), encoder(o)))) : (new Json(3, []))];
+}
+
+/**
+ * Try to encode the given object using the given encoder, or return Encode.nil if the object is null
+ */
+export function tryInclude(name, encoder, value) {
+    return [name, (value != null) ? encoder(value_1(value)) : (new Json(3, []))];
+}
+
+/**
+ * Try to encode the given object using the given encoder, or return Encode.nil if the object is null
+ */
+export function tryIncludeSeq(name, encoder, value) {
+    return [name, (value != null) ? seq(map(encoder, value_1(value))) : (new Json(3, []))];
+}
+
+export function tryIncludeArray(name, encoder, value) {
+    return [name, (value != null) ? (new Json(6, [map_1(encoder, value)])) : (new Json(3, []))];
+}
+
+export function tryIncludeList(name, encoder, value) {
+    return [name, (value != null) ? list_1(map_2(encoder, value)) : (new Json(3, []))];
 }
 

package/ISA/ISA.Json/Investigation.js

@@ -1,103 +1,68 @@
-import { replace } from "../../fable_modules/fable-library.4.5.0/String.js";
-import { URIModule_toString } from "../ISA/JsonTypes/URI.js";
-import { toString, nil, object as object_24 } from "../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
-import { empty as empty_1, choose } from "../../fable_modules/fable-library.4.5.0/List.js";
-import { uncurry2, equals } from "../../fable_modules/fable-library.4.5.0/Util.js";
-import { empty, singleton, append, delay, toList } from "../../fable_modules/fable-library.4.5.0/Seq.js";
-import { ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions_$ctor, ConverterOptions__get_IncludeType, ConverterOptions__get_SetID } from "./ConverterOptions.js";
-import { tryInclude } from "./GEncode.js";
+import { empty as empty_1, ofArray, choose } 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 { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
+import { empty, singleton, append, delay, toList } from "../../fable_modules/fable-library-js.4.13.0/Seq.js";
+import { ConverterOptions__set_IsRoCrate_Z1FBCCD16, ConverterOptions__set_IncludeContext_Z1FBCCD16, ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions_$ctor, ConverterOptions__get_IncludeContext, ConverterOptions__get_IncludeType, ConverterOptions__get_SetID } from "./ConverterOptions.js";
+import { tryIncludeList, tryInclude } from "./GEncode.js";
 import { OntologySourceReference_decoder, OntologySourceReference_encoder } from "./Ontology.js";
-import { decoder as decoder_6, encoder as encoder_1 } from "./Publication.js";
-import { decoder as decoder_7, encoder as encoder_2 } from "./Person.js";
+import { decoder as decoder_2, encoder as encoder_1 } from "./Publication.js";
+import { decoder as decoder_3, encoder as encoder_2 } from "./Person.js";
 import { Study_decoder, Study_encoder } from "./Study.js";
-import { decoder as decoder_8, encoder as encoder_3 } from "./Comment.js";
-import { list as list_1, string, object as object_25 } from "../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
+import { decoder as decoder_4, encoder as encoder_3 } from "./Comment.js";
+import { context_jsonvalue } from "./context/rocrate/isa_investigation_context.js";
+import { context_jsonvalue as context_jsonvalue_1, conformsTo_jsonvalue } from "./context/rocrate/rocrate_context.js";
+import { object } from "./Decode.js";
+import { list as list_1, string } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { Investigation } from "../ISA/JsonTypes/Investigation.js";
-import { fromJsonString as fromJsonString_1 } from "./Decode.js";
+import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
+import { printf, toText } from "../../fable_modules/fable-library-js.4.13.0/String.js";
+import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
 
 export function genID(i) {
-    const matchValue = i.ID;
-    if (matchValue == null) {
-        const matchValue_1 = i.FileName;
-        if (matchValue_1 == null) {
-            const matchValue_2 = i.Identifier;
-            if (matchValue_2 == null) {
-                const matchValue_3 = i.Title;
-                if (matchValue_3 == null) {
-                    return "#EmptyStudy";
-                }
-                else {
-                    return "#Study_" + replace(matchValue_3, " ", "_");
-                }
-            }
-            else {
-                return "#Study_" + replace(matchValue_2, " ", "_");
-            }
+    return "./";
+}
+
+export function encoder(options, oa) {
+    return new Json(5, [choose((tupledArg) => {
+        const v = tupledArg[1];
+        if (equals(v, new Json(3, []))) {
+            return void 0;
         }
         else {
-            return "#Study_" + replace(matchValue_1, " ", "_");
+            return [tupledArg[0], v];
         }
-    }
-    else {
-        return URIModule_toString(matchValue);
-    }
+    }, toList(delay(() => append(ConverterOptions__get_SetID(options) ? singleton(["@id", new Json(0, [genID(oa)])]) : singleton(tryInclude("@id", (value_1) => (new Json(0, [value_1])), oa.ID)), delay(() => append(ConverterOptions__get_IncludeType(options) ? singleton(["@type", new Json(0, ["Investigation"])]) : empty(), delay(() => append(singleton(tryInclude("filename", (value_4) => (new Json(0, [value_4])), oa.FileName)), delay(() => append(singleton(tryInclude("identifier", (value_6) => (new Json(0, [value_6])), oa.Identifier)), delay(() => append(singleton(tryInclude("title", (value_8) => (new Json(0, [value_8])), oa.Title)), delay(() => append(singleton(tryInclude("description", (value_10) => (new Json(0, [value_10])), oa.Description)), delay(() => append(singleton(tryInclude("submissionDate", (value_12) => (new Json(0, [value_12])), oa.SubmissionDate)), delay(() => append(singleton(tryInclude("publicReleaseDate", (value_14) => (new Json(0, [value_14])), oa.PublicReleaseDate)), delay(() => append(singleton(tryIncludeList("ontologySourceReferences", (osr) => OntologySourceReference_encoder(options, osr), oa.OntologySourceReferences)), delay(() => append(singleton(tryIncludeList("publications", (oa_1) => encoder_1(options, oa_1), oa.Publications)), delay(() => append(singleton(tryIncludeList("people", (oa_2) => encoder_2(options, oa_2), oa.Contacts)), delay(() => append(singleton(tryIncludeList("studies", (oa_3) => Study_encoder(options, oa_3), oa.Studies)), delay(() => append(singleton(tryIncludeList("comments", (comment) => encoder_3(options, comment), oa.Comments)), delay(() => (ConverterOptions__get_IncludeContext(options) ? singleton(["@context", context_jsonvalue]) : empty()))))))))))))))))))))))))))))))]);
 }
 
-export function encoder(options, oa) {
-    return object_24(choose((tupledArg) => {
+export function encodeRoCrate(options, oa) {
+    return new Json(5, [choose((tupledArg) => {
         const v = tupledArg[1];
-        if (equals(v, nil)) {
+        if (equals(v, new Json(3, []))) {
             return void 0;
         }
         else {
             return [tupledArg[0], v];
         }
-    }, toList(delay(() => {
-        let value, s;
-        return append(ConverterOptions__get_SetID(options) ? singleton(["@id", (value = genID(oa), (typeof value === "string") ? ((s = value, s)) : nil)]) : singleton(tryInclude("@id", (value_2) => {
-            let s_1;
-            const value_3 = value_2;
-            return (typeof value_3 === "string") ? ((s_1 = value_3, s_1)) : nil;
-        }, oa["ID"])), delay(() => {
-            let value_5, s_2;
-            return append(ConverterOptions__get_IncludeType(options) ? singleton(["@type", (value_5 = "Investigation", (typeof value_5 === "string") ? ((s_2 = value_5, s_2)) : nil)]) : empty(), delay(() => append(singleton(tryInclude("filename", (value_7) => {
-                let s_3;
-                const value_8 = value_7;
-                return (typeof value_8 === "string") ? ((s_3 = value_8, s_3)) : nil;
-            }, oa["FileName"])), delay(() => append(singleton(tryInclude("identifier", (value_10) => {
-                let s_4;
-                const value_11 = value_10;
-                return (typeof value_11 === "string") ? ((s_4 = value_11, s_4)) : nil;
-            }, oa["Identifier"])), delay(() => append(singleton(tryInclude("title", (value_13) => {
-                let s_5;
-                const value_14 = value_13;
-                return (typeof value_14 === "string") ? ((s_5 = value_14, s_5)) : nil;
-            }, oa["Title"])), delay(() => append(singleton(tryInclude("description", (value_16) => {
-                let s_6;
-                const value_17 = value_16;
-                return (typeof value_17 === "string") ? ((s_6 = value_17, s_6)) : nil;
-            }, oa["Description"])), delay(() => append(singleton(tryInclude("submissionDate", (value_19) => {
-                let s_7;
-                const value_20 = value_19;
-                return (typeof value_20 === "string") ? ((s_7 = value_20, s_7)) : nil;
-            }, oa["SubmissionDate"])), delay(() => append(singleton(tryInclude("publicReleaseDate", (value_22) => {
-                let s_8;
-                const value_23 = value_22;
-                return (typeof value_23 === "string") ? ((s_8 = value_23, s_8)) : nil;
-            }, oa["PublicReleaseDate"])), delay(() => append(singleton(tryInclude("ontologySourceReferences", (osr) => OntologySourceReference_encoder(options, osr), oa["OntologySourceReferences"])), delay(() => append(singleton(tryInclude("publications", (oa_1) => encoder_1(options, oa_1), oa["Publications"])), delay(() => append(singleton(tryInclude("people", (oa_2) => encoder_2(options, oa_2), oa["Contacts"])), delay(() => append(singleton(tryInclude("studies", (oa_3) => Study_encoder(options, oa_3), oa["Studies"])), delay(() => singleton(tryInclude("comments", (comment) => encoder_3(options, comment), oa["Comments"]))))))))))))))))))))))));
-        }));
-    }))));
+    }, toList(delay(() => append(singleton(tryInclude("@type", (value) => (new Json(0, [value])), "CreativeWork")), delay(() => append(singleton(tryInclude("@id", (value_2) => (new Json(0, [value_2])), "ro-crate-metadata.json")), delay(() => append(singleton(tryInclude("about", (oa_1) => encoder(options, oa_1), oa)), delay(() => append(singleton(["conformsTo", conformsTo_jsonvalue]), delay(() => (ConverterOptions__get_IncludeContext(options) ? singleton(["@context", context_jsonvalue_1]) : empty()))))))))))))]);
 }
 
+export const allowedFields = ofArray(["@id", "filename", "identifier", "title", "description", "submissionDate", "publicReleaseDate", "ontologySourceReferences", "publications", "people", "studies", "comments", "@type", "@context"]);
+
 export function decoder(options) {
-    return (path_12) => ((v) => object_25((get$) => {
-        let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, objectArg_6, arg_15, decoder_1, objectArg_7, arg_17, decoder_2, objectArg_8, arg_19, decoder_3, objectArg_9, arg_21, decoder_4, objectArg_10, arg_23, decoder_5, objectArg_11;
-        return new Investigation((objectArg = get$.Optional, objectArg.Field("@id", string)), (objectArg_1 = get$.Optional, objectArg_1.Field("filename", string)), (objectArg_2 = get$.Optional, objectArg_2.Field("identifier", string)), (objectArg_3 = get$.Optional, objectArg_3.Field("title", string)), (objectArg_4 = get$.Optional, objectArg_4.Field("description", string)), (objectArg_5 = get$.Optional, objectArg_5.Field("submissionDate", string)), (objectArg_6 = get$.Optional, objectArg_6.Field("publicReleaseDate", string)), (arg_15 = ((decoder_1 = OntologySourceReference_decoder(options), (path_7) => ((value_7) => list_1(uncurry2(decoder_1), path_7, value_7)))), (objectArg_7 = get$.Optional, objectArg_7.Field("ontologySourceReferences", uncurry2(arg_15)))), (arg_17 = ((decoder_2 = decoder_6(options), (path_8) => ((value_8) => list_1(uncurry2(decoder_2), path_8, value_8)))), (objectArg_8 = get$.Optional, objectArg_8.Field("publications", uncurry2(arg_17)))), (arg_19 = ((decoder_3 = decoder_7(options), (path_9) => ((value_9) => list_1(uncurry2(decoder_3), path_9, value_9)))), (objectArg_9 = get$.Optional, objectArg_9.Field("people", uncurry2(arg_19)))), (arg_21 = ((decoder_4 = Study_decoder(options), (path_10) => ((value_10) => list_1(uncurry2(decoder_4), path_10, value_10)))), (objectArg_10 = get$.Optional, objectArg_10.Field("studies", uncurry2(arg_21)))), (arg_23 = ((decoder_5 = decoder_8(options), (path_11) => ((value_11) => list_1(uncurry2(decoder_5), path_11, value_11)))), (objectArg_11 = get$.Optional, objectArg_11.Field("comments", uncurry2(arg_23)))), empty_1());
-    }, path_12, v));
+    return object(allowedFields, (get$) => {
+        let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, objectArg_6, arg_15, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10, arg_23, objectArg_11;
+        return new Investigation((objectArg = get$.Optional, objectArg.Field("@id", string)), (objectArg_1 = get$.Optional, objectArg_1.Field("filename", string)), (objectArg_2 = get$.Optional, objectArg_2.Field("identifier", string)), (objectArg_3 = get$.Optional, objectArg_3.Field("title", string)), (objectArg_4 = get$.Optional, objectArg_4.Field("description", string)), (objectArg_5 = get$.Optional, objectArg_5.Field("submissionDate", string)), (objectArg_6 = get$.Optional, objectArg_6.Field("publicReleaseDate", string)), (arg_15 = list_1(OntologySourceReference_decoder(options)), (objectArg_7 = get$.Optional, objectArg_7.Field("ontologySourceReferences", arg_15))), (arg_17 = list_1(decoder_2(options)), (objectArg_8 = get$.Optional, objectArg_8.Field("publications", arg_17))), (arg_19 = list_1(decoder_3(options)), (objectArg_9 = get$.Optional, objectArg_9.Field("people", arg_19))), (arg_21 = list_1(Study_decoder(options)), (objectArg_10 = get$.Optional, objectArg_10.Field("studies", arg_21))), (arg_23 = list_1(decoder_4(options)), (objectArg_11 = get$.Optional, objectArg_11.Field("comments", arg_23))), empty_1());
+    });
 }
 
 export function fromJsonString(s) {
-    return fromJsonString_1(uncurry2(decoder(ConverterOptions_$ctor())), s);
+    const matchValue = fromString(decoder(ConverterOptions_$ctor()), s);
+    if (matchValue.tag === 1) {
+        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+    }
+    else {
+        return matchValue.fields[0];
+    }
 }
 
 export function toJsonString(p) {
@@ -107,8 +72,18 @@ export function toJsonString(p) {
 /**
  * exports in json-ld format
  */
-export function toStringLD(i) {
+export function toJsonldString(i) {
     let returnVal;
     return toString(2, encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), i));
 }
 
+export function toJsonldStringWithContext(i) {
+    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)), i));
+}
+
+export function toRoCrateString(i) {
+    let returnVal;
+    return toString(2, encodeRoCrate((returnVal = ConverterOptions_$ctor(), ((((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), ConverterOptions__set_IncludeContext_Z1FBCCD16(returnVal, true)), ConverterOptions__set_IsRoCrate_Z1FBCCD16(returnVal, true)), returnVal)), i));
+}
+