@nfdi4plants/arctrl 2.0.0 → 2.1.0-alpha.1

package/Json/Comment.js

@@ -1,34 +1,38 @@
-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, tryInclude } from "./Encode.js";
-import { map, 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 { value as value_6, unwrap, map } from "../fable_modules/fable-library-js.4.22.0/Option.js";
+import { tryInclude } from "./Encode.js";
+import { map as map_1 } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
+import { map as map_2, string, object } from "../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { Comment$ } from "../Core/Comment.js";
-import { value as value_6, unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.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_comment_context.js";
-import { toString } from "../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
-import { fromString } from "../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
+import { toString } from "../fable_modules/fable-library-js.4.22.0/Types.js";
 import { encode } from "./IDTable.js";
 
-export function Comment_encoder(comment) {
-    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("name", (value) => (new Json(0, [value])), comment.Name), tryInclude("value", (value_2) => (new Json(0, [value_2])), comment.Value)]))]);
+export function encoder(comment) {
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("name", (value) => ({
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    }), comment.Name), tryInclude("value", (value_2) => ({
+        Encode(helpers_1) {
+            return helpers_1.encodeString(value_2);
+        },
+    }), comment.Value)]));
+    return {
+        Encode(helpers_2) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_2)], values);
+            return helpers_2.encodeObject(arg);
+        },
+    };
 }
 
-export const Comment_decoder = object((get$) => {
+export const decoder = object((get$) => {
     let objectArg, objectArg_1;
     return new Comment$(unwrap((objectArg = get$.Optional, objectArg.Field("name", string))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("value", string))));
 });
 
-export function Comment_ROCrate_genID(c) {
+export function ROCrate_genID(c) {
     const matchValue = c.Name;
     if (matchValue == null) {
         return "#EmptyComment";
@@ -40,120 +44,78 @@ export function Comment_ROCrate_genID(c) {
     }
 }
 
-export function Comment_ROCrate_encoder(comment) {
-    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, [Comment_ROCrate_genID(comment)])], ["@type", new Json(0, ["Comment"])], tryInclude("name", (value_2) => (new Json(0, [value_2])), comment.Name), tryInclude("value", (value_4) => (new Json(0, [value_4])), comment.Value), ["@context", context_jsonvalue]]))]);
+export function ROCrate_encoder(comment) {
+    let value;
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(comment), {
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    })], ["@type", {
+        Encode(helpers_1) {
+            return helpers_1.encodeString("Comment");
+        },
+    }], tryInclude("name", (value_2) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_2);
+        },
+    }), comment.Name), tryInclude("value", (value_4) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_4);
+        },
+    }), comment.Value), ["@context", context_jsonvalue]]));
+    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 Comment_ROCrate_decoder = object((get$) => {
+export const ROCrate_decoder = object((get$) => {
     let objectArg, objectArg_1;
     return new Comment$(unwrap((objectArg = get$.Optional, objectArg.Field("name", string))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("value", string))));
 });
 
-export function Comment_ROCrate_encoderDisambiguatingDescription(comment) {
-    return new Json(0, [toString(0, Comment_ROCrate_encoder(comment))]);
-}
-
-export const Comment_ROCrate_decoderDisambiguatingDescription = map((s) => {
-    const matchValue = fromString(Comment_ROCrate_decoder, s.trim());
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}, string);
-
-export function Comment_ISAJson_encoder(idMap, comment) {
-    const f = (comment_1) => (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])), Comment_ROCrate_genID(comment_1)), tryInclude("name", (value_2) => (new Json(0, [value_2])), comment_1.Name), tryInclude("value", (value_4) => (new Json(0, [value_4])), comment_1.Value)]))]));
-    if (idMap == null) {
-        return f(comment);
-    }
-    else {
-        return encode(Comment_ROCrate_genID, f, comment, idMap);
-    }
-}
-
-export const Comment_ISAJson_decoder = Comment_decoder;
-
-export function ARCtrl_Comment__Comment_fromJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Comment_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_Comment__Comment_toJsonString_Static_71136F3F(spaces) {
-    return (c) => {
-        const value = Comment_encoder(c);
-        return toString(defaultSpaces(spaces), value);
+export function ROCrate_encoderDisambiguatingDescription(comment) {
+    const value = toString(comment);
+    return {
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
     };
 }
 
-export function ARCtrl_Comment__Comment_toJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Comment__Comment_toJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-
-export function ARCtrl_Comment__Comment_fromROCrateJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Comment_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_Comment__Comment_toROCrateJsonString_Static_71136F3F(spaces) {
-    return (c) => {
-        const value = Comment_ROCrate_encoder(c);
-        return toString(defaultSpaces(spaces), value);
+export const ROCrate_decoderDisambiguatingDescription = map_2((s) => Comment$.fromString(s), string);
+
+export function ISAJson_encoder(idMap, comment) {
+    const f = (comment_1) => {
+        const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value) => ({
+            Encode(helpers) {
+                return helpers.encodeString(value);
+            },
+        }), ROCrate_genID(comment_1)), tryInclude("name", (value_2) => ({
+            Encode(helpers_1) {
+                return helpers_1.encodeString(value_2);
+            },
+        }), comment_1.Name), tryInclude("value", (value_4) => ({
+            Encode(helpers_2) {
+                return helpers_2.encodeString(value_4);
+            },
+        }), comment_1.Value)]));
+        return {
+            Encode(helpers_3) {
+                const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values);
+                return helpers_3.encodeObject(arg);
+            },
+        };
     };
-}
-
-export function ARCtrl_Comment__Comment_toROCrateJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Comment__Comment_toROCrateJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-
-export function ARCtrl_Comment__Comment_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Comment_ISAJson_decoder, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+    if (idMap == null) {
+        return f(comment);
     }
     else {
-        return matchValue.fields[0];
+        return encode(ROCrate_genID, f, comment, idMap);
     }
 }
 
-export function ARCtrl_Comment__Comment_toISAJsonString_Static_71136F3F(spaces) {
-    return (c) => {
-        const value = Comment_ISAJson_encoder(void 0, c);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Comment__Comment_toISAJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Comment__Comment_toISAJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
+export const ISAJson_decoder = decoder;
 

package/Json/ConverterOptions.js

@@ -1,5 +1,5 @@
-import { Union } from "../fable_modules/fable-library-js.4.16.0/Types.js";
-import { union_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { Union } from "../fable_modules/fable-library-js.4.22.0/Types.js";
+import { union_type } from "../fable_modules/fable-library-js.4.22.0/Reflection.js";
 
 export class ConverterOptions extends Union {
     constructor(tag, fields) {

package/Json/Data.js

@@ -1,59 +1,68 @@
-import { singleton, 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 { DataFile_ROCrate_decoder, DataFile_ROCrate_encoder, DataFile_ISAJson_decoder, DataFile_ISAJson_encoder } from "./DataFile.js";
-import { Comment_ISAJson_decoder, Comment_ISAJson_encoder, Comment_ROCrate_decoder, Comment_ROCrate_encoder, Comment_decoder, Comment_encoder } from "./Comment.js";
-import { string, object } from "../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { singleton, 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 { ROCrate_decoder as ROCrate_decoder_1, ROCrate_encoder as ROCrate_encoder_1, ISAJson_decoder as ISAJson_decoder_1, ISAJson_encoder as ISAJson_encoder_1 } from "./DataFile.js";
+import { ISAJson_decoder as ISAJson_decoder_2, ISAJson_encoder as ISAJson_encoder_2, ROCrate_decoder as ROCrate_decoder_2, ROCrate_encoder as ROCrate_encoder_2, 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 { resizeArray, string, object } from "../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { Data } from "../Core/Data.js";
-import { defaultArg, unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
-import { Decode_objectNoAdditionalProperties, Decode_resizeArray, Decode_uri } from "./Decode.js";
+import { Decode_objectNoAdditionalProperties, Decode_uri } 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 { list as list_1 } from "../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
+import { list as list_1 } from "../fable_modules/Thoth.Json.Core.0.4.0/Encode.fs.js";
 import { context_jsonvalue } from "./context/rocrate/isa_data_context.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 function Data_encoder(d) {
-    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])), d.ID), tryInclude("name", (value_2) => (new Json(0, [value_2])), d.Name), tryInclude("dataType", DataFile_ISAJson_encoder, d.DataType), tryInclude("format", (value_4) => (new Json(0, [value_4])), d.Format), tryInclude("selectorFormat", (value_6) => (new Json(0, [value_6])), d.SelectorFormat), tryIncludeSeq("comments", Comment_encoder, d.Comments)]))]);
+export function encoder(d) {
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value) => ({
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    }), d.ID), tryInclude("name", (value_2) => ({
+        Encode(helpers_1) {
+            return helpers_1.encodeString(value_2);
+        },
+    }), d.Name), tryInclude("dataType", ISAJson_encoder_1, d.DataType), tryInclude("format", (value_4) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_4);
+        },
+    }), d.Format), tryInclude("selectorFormat", (value_6) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_6);
+        },
+    }), d.SelectorFormat), tryIncludeSeq("comments", encoder_1, d.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 Data_decoder = object((get$) => {
+export const decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5;
-    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("dataType", DataFile_ISAJson_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("format", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("selectorFormat", Decode_uri))), unwrap((arg_11 = Decode_resizeArray(Comment_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("comments", arg_11)))));
+    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("dataType", ISAJson_decoder_1))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("format", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("selectorFormat", Decode_uri))), unwrap((arg_11 = resizeArray(decoder_1), (objectArg_5 = get$.Optional, objectArg_5.Field("comments", arg_11)))));
 });
 
-export function Data_compressedEncoder(stringTable, d) {
-    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("i", (s) => encodeString(stringTable, s), d.ID), tryInclude("n", (s_1) => encodeString(stringTable, s_1), d.Name), tryInclude("d", DataFile_ISAJson_encoder, d.DataType), tryInclude("f", (s_2) => encodeString(stringTable, s_2), d.Format), tryInclude("s", (s_3) => encodeString(stringTable, s_3), d.SelectorFormat), tryIncludeSeq("c", Comment_encoder, d.Comments)]))]);
+export function compressedEncoder(stringTable, d) {
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("i", (s) => encodeString(stringTable, s), d.ID), tryInclude("n", (s_1) => encodeString(stringTable, s_1), d.Name), tryInclude("d", ISAJson_encoder_1, d.DataType), tryInclude("f", (s_2) => encodeString(stringTable, s_2), d.Format), tryInclude("s", (s_3) => encodeString(stringTable, s_3), d.SelectorFormat), tryIncludeSeq("c", encoder_1, d.Comments)]));
+    return {
+        Encode(helpers) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers)], values);
+            return helpers.encodeObject(arg);
+        },
+    };
 }
 
-export function Data_compressedDecoder(stringTable) {
+export function compressedDecoder(stringTable) {
     return object((get$) => {
         let arg_1, objectArg, arg_3, objectArg_1, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4, arg_11, objectArg_5;
-        return new Data(unwrap((arg_1 = decodeString(stringTable), (objectArg = get$.Optional, objectArg.Field("i", arg_1)))), unwrap((arg_3 = decodeString(stringTable), (objectArg_1 = get$.Optional, objectArg_1.Field("n", arg_3)))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("d", DataFile_ISAJson_decoder))), unwrap((arg_7 = decodeString(stringTable), (objectArg_3 = get$.Optional, objectArg_3.Field("f", arg_7)))), unwrap((arg_9 = decodeString(stringTable), (objectArg_4 = get$.Optional, objectArg_4.Field("s", arg_9)))), unwrap((arg_11 = Decode_resizeArray(Comment_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("c", arg_11)))));
+        return new Data(unwrap((arg_1 = decodeString(stringTable), (objectArg = get$.Optional, objectArg.Field("i", arg_1)))), unwrap((arg_3 = decodeString(stringTable), (objectArg_1 = get$.Optional, objectArg_1.Field("n", arg_3)))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("d", ISAJson_decoder_1))), unwrap((arg_7 = decodeString(stringTable), (objectArg_3 = get$.Optional, objectArg_3.Field("f", arg_7)))), unwrap((arg_9 = decodeString(stringTable), (objectArg_4 = get$.Optional, objectArg_4.Field("s", arg_9)))), unwrap((arg_11 = resizeArray(decoder_1), (objectArg_5 = get$.Optional, objectArg_5.Field("c", arg_11)))));
     });
 }
 
-export function Data_ROCrate_genID(d) {
+export function ROCrate_genID(d) {
     const matchValue = d.ID;
     if (matchValue == null) {
         const matchValue_1 = d.Name;
@@ -69,88 +78,72 @@ export function Data_ROCrate_genID(d) {
     }
 }
 
-export function Data_ROCrate_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([["@id", new Json(0, [Data_ROCrate_genID(oa)])], ["@type", list_1(singleton(new Json(0, ["Data"])))], tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", DataFile_ROCrate_encoder, oa.DataType), tryInclude("encodingFormat", (value_5) => (new Json(0, [value_5])), oa.Format), tryInclude("usageInfo", (value_7) => (new Json(0, [value_7])), oa.SelectorFormat), tryIncludeSeq("comments", Comment_ROCrate_encoder, oa.Comments), ["@context", context_jsonvalue]]))]);
+export function ROCrate_encoder(oa) {
+    let value;
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(oa), {
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    })], ["@type", list_1(singleton({
+        Encode(helpers_1) {
+            return helpers_1.encodeString("Data");
+        },
+    }))], tryInclude("name", (value_2) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_2);
+        },
+    }), oa.Name), tryInclude("type", ROCrate_encoder_1, oa.DataType), tryInclude("encodingFormat", (value_5) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_5);
+        },
+    }), oa.Format), tryInclude("usageInfo", (value_7) => ({
+        Encode(helpers_4) {
+            return helpers_4.encodeString(value_7);
+        },
+    }), oa.SelectorFormat), tryIncludeSeq("comments", ROCrate_encoder_2, oa.Comments), ["@context", context_jsonvalue]]));
+    return {
+        Encode(helpers_5) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_5)], values);
+            return helpers_5.encodeObject(arg);
+        },
+    };
 }
 
-export const Data_ROCrate_decoder = object((get$) => {
+export const ROCrate_decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5;
-    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("type", DataFile_ROCrate_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("encodingFormat", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("usageInfo", Decode_uri))), unwrap((arg_11 = Decode_resizeArray(Comment_ROCrate_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("comments", arg_11)))));
+    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("type", ROCrate_decoder_1))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("encodingFormat", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("usageInfo", Decode_uri))), unwrap((arg_11 = resizeArray(ROCrate_decoder_2), (objectArg_5 = get$.Optional, objectArg_5.Field("comments", arg_11)))));
 });
 
-export function Data_ISAJson_encoder(idMap, oa) {
-    const f = (oa_1) => (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])), Data_ROCrate_genID(oa_1)), tryInclude("name", (value_2) => (new Json(0, [value_2])), oa_1.Name), tryInclude("type", DataFile_ISAJson_encoder, oa_1.DataType), tryIncludeSeq("comments", (comment) => Comment_ISAJson_encoder(idMap, comment), oa_1.Comments)]))]));
+export function ISAJson_encoder(idMap, oa) {
+    const f = (oa_1) => {
+        const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value) => ({
+            Encode(helpers) {
+                return helpers.encodeString(value);
+            },
+        }), ROCrate_genID(oa_1)), tryInclude("name", (value_2) => ({
+            Encode(helpers_1) {
+                return helpers_1.encodeString(value_2);
+            },
+        }), oa_1.Name), tryInclude("type", ISAJson_encoder_1, oa_1.DataType), tryIncludeSeq("comments", (comment) => ISAJson_encoder_2(idMap, comment), oa_1.Comments)]));
+        return {
+            Encode(helpers_2) {
+                const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_2)], values);
+                return helpers_2.encodeObject(arg);
+            },
+        };
+    };
     if (idMap != null) {
-        return encode(Data_ROCrate_genID, f, oa, idMap);
+        return encode(ROCrate_genID, f, oa, idMap);
     }
     else {
         return f(oa);
     }
 }
 
-export const Data_ISAJson_allowedFields = ofArray(["@id", "name", "type", "comments", "@type", "@context"]);
+export const ISAJson_allowedFields = ofArray(["@id", "name", "type", "comments", "@type", "@context"]);
 
-export const Data_ISAJson_decoder = Decode_objectNoAdditionalProperties(Data_ISAJson_allowedFields, (get$) => {
+export const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedFields, (get$) => {
     let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3;
-    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("type", DataFile_ISAJson_decoder))), void 0, void 0, unwrap((arg_7 = Decode_resizeArray(Comment_ISAJson_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7)))));
+    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("type", ISAJson_decoder_1))), undefined, undefined, unwrap((arg_7 = resizeArray(ISAJson_decoder_2), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7)))));
 });
 
-export function ARCtrl_Data__Data_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Data_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_Data__Data_toISAJsonString_Static_Z3B036AA(spaces, useIDReferencing) {
-    const idMap = defaultArg(useIDReferencing, false) ? (new Map([])) : void 0;
-    return (f) => {
-        const value_1 = Data_ISAJson_encoder(idMap, f);
-        return toString(defaultSpaces(spaces), value_1);
-    };
-}
-
-export function ARCtrl_Data__Data_toISAJsonString_Z3B036AA(this$, spaces, useIDReferencing) {
-    return ARCtrl_Data__Data_toISAJsonString_Static_Z3B036AA(unwrap(spaces), unwrap(useIDReferencing))(this$);
-}
-
-export function ARCtrl_Data__Data_fromROCrateJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Data_ROCrate_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_Data__Data_toROCrateJsonString_Static_71136F3F(spaces) {
-    return (f) => {
-        const value = Data_ROCrate_encoder(f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Data__Data_toROCrateJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Data__Data_toROCrateJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-

package/Json/DataFile.js

@@ -1,25 +1,32 @@
-import { ErrorReason$1, Json } from "../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
-import { string } from "../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
-import { FSharpResult$2 } from "../fable_modules/fable-library-js.4.16.0/Result.js";
+import { string } from "../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
+import { FSharpResult$2 } from "../fable_modules/fable-library-js.4.22.0/Result.js";
 import { DataFile } from "../Core/DataFile.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.16.0/String.js";
-import { toString } from "../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
-import { defaultSpaces } from "./Encode.js";
-import { unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { ErrorReason$1 } from "../fable_modules/Thoth.Json.Core.0.4.0/Types.fs.js";
 
-export function DataFile_ROCrate_encoder(value) {
+export function ROCrate_encoder(value) {
     switch (value.tag) {
         case 1:
-            return new Json(0, ["Derived Data File"]);
+            return {
+                Encode(helpers_1) {
+                    return helpers_1.encodeString("Derived Data File");
+                },
+            };
         case 2:
-            return new Json(0, ["Image File"]);
+            return {
+                Encode(helpers_2) {
+                    return helpers_2.encodeString("Image File");
+                },
+            };
         default:
-            return new Json(0, ["Raw Data File"]);
+            return {
+                Encode(helpers) {
+                    return helpers.encodeString("Raw Data File");
+                },
+            };
     }
 }
 
-export const DataFile_ROCrate_decoder = {
+export const ROCrate_decoder = {
     Decode(s, json) {
         const matchValue = string.Decode(s, json);
         if (matchValue.tag === 1) {
@@ -42,49 +49,7 @@ export const DataFile_ROCrate_decoder = {
     },
 };
 
-export const DataFile_ISAJson_encoder = DataFile_ROCrate_encoder;
+export const ISAJson_encoder = ROCrate_encoder;
 
-export const DataFile_ISAJson_decoder = DataFile_ROCrate_decoder;
-
-export function ARCtrl_DataFile__DataFile_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(DataFile_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_DataFile__DataFile_toISAJsonString_Static_71136F3F(spaces) {
-    return (f) => {
-        const value = DataFile_ISAJson_encoder(f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_DataFile__DataFile_ToISAJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_DataFile__DataFile_toISAJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-
-export function ARCtrl_DataFile__DataFile_fromROCrateJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(DataFile_ROCrate_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_DataFile__DataFile_toROCrateJsonString_Static_71136F3F(spaces) {
-    return (f) => {
-        const value = DataFile_ROCrate_encoder(f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_DataFile__DataFile_ToROCrateJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_DataFile__DataFile_toROCrateJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
+export const ISAJson_decoder = ROCrate_decoder;