@nfdi4plants/arctrl 2.0.1 → 2.1.0-alpha.2

package/Json/Person.js

@@ -1,41 +1,71 @@
-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 { ofArray, choose } from "../fable_modules/fable-library-js.4.22.0/List.js";
+import { defaultArg, unwrap, map } from "../fable_modules/fable-library-js.4.22.0/Option.js";
+import { tryIncludeSeq, tryInclude } from "./Encode.js";
 import { OntologyAnnotation_ROCrate_decoderDefinedTerm, OntologyAnnotation_ROCrate_encoderDefinedTerm, OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "./OntologyAnnotation.js";
-import { Comment_ROCrate_decoderDisambiguatingDescription, Comment_ROCrate_encoderDisambiguatingDescription, Comment_decoder, Comment_encoder } from "./Comment.js";
-import { array as array_2, map as map_1, string, object } from "../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { ROCrate_decoderDisambiguatingDescription, ROCrate_encoderDisambiguatingDescription, decoder as decoder_1, encoder as encoder_1 } from "./Comment.js";
+import { tryPick, map as map_1 } from "../fable_modules/fable-library-js.4.22.0/Seq.js";
+import { array as array_3, map as map_3, resizeArray, string, object } from "../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { Person } from "../Core/Person.js";
-import { defaultArg, unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
-import { Decode_objectNoAdditionalProperties, Decode_resizeArray } from "./Decode.js";
-import { tryPick } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
-import { printf, toText, join, split, replace } from "../fable_modules/fable-library-js.4.16.0/String.js";
+import { join, split, replace } from "../fable_modules/fable-library-js.4.22.0/String.js";
 import { context_jsonvalue } from "./context/rocrate/isa_organization_context.js";
 import { contextMinimal_jsonValue, context_jsonvalue as context_jsonvalue_1 } from "./context/rocrate/isa_person_context.js";
-import { map } from "../fable_modules/fable-library-js.4.16.0/Array.js";
+import { map as map_2 } from "../fable_modules/fable-library-js.4.22.0/Array.js";
 import { Person_setOrcidFromComments, Person_setCommentFromORCID } from "../Core/Conversion.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";
+import { Decode_objectNoAdditionalProperties } from "./Decode.js";
 
-export function Person_encoder(person) {
-    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("firstName", (value) => (new Json(0, [value])), person.FirstName), tryInclude("lastName", (value_2) => (new Json(0, [value_2])), person.LastName), tryInclude("midInitials", (value_4) => (new Json(0, [value_4])), person.MidInitials), tryInclude("orcid", (value_6) => (new Json(0, [value_6])), person.ORCID), tryInclude("email", (value_8) => (new Json(0, [value_8])), person.EMail), tryInclude("phone", (value_10) => (new Json(0, [value_10])), person.Phone), tryInclude("fax", (value_12) => (new Json(0, [value_12])), person.Fax), tryInclude("address", (value_14) => (new Json(0, [value_14])), person.Address), tryInclude("affiliation", (value_16) => (new Json(0, [value_16])), person.Affiliation), tryIncludeSeq("roles", OntologyAnnotation_encoder, person.Roles), tryIncludeSeq("comments", Comment_encoder, person.Comments)]))]);
+export function encoder(person) {
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("firstName", (value) => ({
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    }), person.FirstName), tryInclude("lastName", (value_2) => ({
+        Encode(helpers_1) {
+            return helpers_1.encodeString(value_2);
+        },
+    }), person.LastName), tryInclude("midInitials", (value_4) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_4);
+        },
+    }), person.MidInitials), tryInclude("orcid", (value_6) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_6);
+        },
+    }), person.ORCID), tryInclude("email", (value_8) => ({
+        Encode(helpers_4) {
+            return helpers_4.encodeString(value_8);
+        },
+    }), person.EMail), tryInclude("phone", (value_10) => ({
+        Encode(helpers_5) {
+            return helpers_5.encodeString(value_10);
+        },
+    }), person.Phone), tryInclude("fax", (value_12) => ({
+        Encode(helpers_6) {
+            return helpers_6.encodeString(value_12);
+        },
+    }), person.Fax), tryInclude("address", (value_14) => ({
+        Encode(helpers_7) {
+            return helpers_7.encodeString(value_14);
+        },
+    }), person.Address), tryInclude("affiliation", (value_16) => ({
+        Encode(helpers_8) {
+            return helpers_8.encodeString(value_16);
+        },
+    }), person.Affiliation), tryIncludeSeq("roles", OntologyAnnotation_encoder, person.Roles), tryIncludeSeq("comments", encoder_1, person.Comments)]));
+    return {
+        Encode(helpers_9) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values);
+            return helpers_9.encodeObject(arg);
+        },
+    };
 }
 
-export const Person_decoder = object((get$) => {
+export const decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, objectArg_6, objectArg_7, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10;
-    return new Person(unwrap((objectArg = get$.Optional, objectArg.Field("orcid", string))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("lastName", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("firstName", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("midInitials", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("email", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("phone", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("fax", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("address", string))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("affiliation", string))), unwrap((arg_19 = Decode_resizeArray(OntologyAnnotation_decoder), (objectArg_9 = get$.Optional, objectArg_9.Field("roles", arg_19)))), unwrap((arg_21 = Decode_resizeArray(Comment_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("comments", arg_21)))));
+    return new Person(unwrap((objectArg = get$.Optional, objectArg.Field("orcid", string))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("lastName", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("firstName", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("midInitials", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("email", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("phone", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("fax", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("address", string))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("affiliation", string))), unwrap((arg_19 = resizeArray(OntologyAnnotation_decoder), (objectArg_9 = get$.Optional, objectArg_9.Field("roles", arg_19)))), unwrap((arg_21 = resizeArray(decoder_1), (objectArg_10 = get$.Optional, objectArg_10.Field("comments", arg_21)))));
 });
 
-export function Person_ROCrate_genID(p) {
+export function ROCrate_genID(p) {
     const orcid = tryPick((c) => {
         const matchValue = c.Name;
         const matchValue_1 = c.Value;
@@ -59,10 +89,10 @@ export function Person_ROCrate_genID(p) {
                     return v;
                 }
                 else {
-                    return void 0;
+                    return undefined;
                 }
             default:
-                return void 0;
+                return undefined;
         }
     }, p.Comments);
     if (orcid == null) {
@@ -128,145 +158,184 @@ export function Person_ROCrate_genID(p) {
     }
 }
 
-export function Person_ROCrate_Affiliation_encoder(affiliation) {
-    return new Json(5, [[["@type", new Json(0, ["Organization"])], ["@id", new Json(0, [replace(`#Organization_${affiliation}`, " ", "_")])], ["name", new Json(0, [affiliation])], ["@context", context_jsonvalue]]]);
+export function ROCrate_Affiliation_encoder(affiliation) {
+    let value_1;
+    const values = ofArray([["@type", {
+        Encode(helpers) {
+            return helpers.encodeString("Organization");
+        },
+    }], ["@id", (value_1 = replace(`#Organization_${affiliation}`, " ", "_"), {
+        Encode(helpers_1) {
+            return helpers_1.encodeString(value_1);
+        },
+    })], ["name", {
+        Encode(helpers_2) {
+            return helpers_2.encodeString(affiliation);
+        },
+    }], ["@context", context_jsonvalue]]);
+    return {
+        Encode(helpers_3) {
+            const arg = map_1((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_3)], values);
+            return helpers_3.encodeObject(arg);
+        },
+    };
 }
 
-export const Person_ROCrate_Affiliation_decoder = object((get$) => {
+export const ROCrate_Affiliation_decoder = object((get$) => {
     const objectArg = get$.Required;
     return objectArg.Field("name", string);
 });
 
-export function Person_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, [Person_ROCrate_genID(oa)])], ["@type", new Json(0, ["Person"])], tryInclude("orcid", (value_2) => (new Json(0, [value_2])), oa.ORCID), tryInclude("firstName", (value_4) => (new Json(0, [value_4])), oa.FirstName), tryInclude("lastName", (value_6) => (new Json(0, [value_6])), oa.LastName), tryInclude("midInitials", (value_8) => (new Json(0, [value_8])), oa.MidInitials), tryInclude("email", (value_10) => (new Json(0, [value_10])), oa.EMail), tryInclude("phone", (value_12) => (new Json(0, [value_12])), oa.Phone), tryInclude("fax", (value_14) => (new Json(0, [value_14])), oa.Fax), tryInclude("address", (value_16) => (new Json(0, [value_16])), oa.Address), tryInclude("affiliation", Person_ROCrate_Affiliation_encoder, oa.Affiliation), tryIncludeSeq("roles", OntologyAnnotation_ROCrate_encoderDefinedTerm, oa.Roles), tryIncludeSeq("comments", Comment_ROCrate_encoderDisambiguatingDescription, oa.Comments), ["@context", context_jsonvalue_1]]))]);
+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", {
+        Encode(helpers_1) {
+            return helpers_1.encodeString("Person");
+        },
+    }], tryInclude("orcid", (value_2) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_2);
+        },
+    }), oa.ORCID), tryInclude("firstName", (value_4) => ({
+        Encode(helpers_3) {
+            return helpers_3.encodeString(value_4);
+        },
+    }), oa.FirstName), tryInclude("lastName", (value_6) => ({
+        Encode(helpers_4) {
+            return helpers_4.encodeString(value_6);
+        },
+    }), oa.LastName), tryInclude("midInitials", (value_8) => ({
+        Encode(helpers_5) {
+            return helpers_5.encodeString(value_8);
+        },
+    }), oa.MidInitials), tryInclude("email", (value_10) => ({
+        Encode(helpers_6) {
+            return helpers_6.encodeString(value_10);
+        },
+    }), oa.EMail), tryInclude("phone", (value_12) => ({
+        Encode(helpers_7) {
+            return helpers_7.encodeString(value_12);
+        },
+    }), oa.Phone), tryInclude("fax", (value_14) => ({
+        Encode(helpers_8) {
+            return helpers_8.encodeString(value_14);
+        },
+    }), oa.Fax), tryInclude("address", (value_16) => ({
+        Encode(helpers_9) {
+            return helpers_9.encodeString(value_16);
+        },
+    }), oa.Address), tryInclude("affiliation", ROCrate_Affiliation_encoder, oa.Affiliation), tryIncludeSeq("roles", OntologyAnnotation_ROCrate_encoderDefinedTerm, oa.Roles), tryIncludeSeq("comments", ROCrate_encoderDisambiguatingDescription, oa.Comments), ["@context", context_jsonvalue_1]]));
+    return {
+        Encode(helpers_10) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_10)], values);
+            return helpers_10.encodeObject(arg);
+        },
+    };
 }
 
-export const Person_ROCrate_decoder = object((get$) => {
+export const ROCrate_decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, objectArg_6, objectArg_7, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10;
-    return new Person(unwrap((objectArg = get$.Optional, objectArg.Field("orcid", string))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("lastName", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("firstName", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("midInitials", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("email", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("phone", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("fax", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("address", string))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("affiliation", Person_ROCrate_Affiliation_decoder))), unwrap((arg_19 = Decode_resizeArray(OntologyAnnotation_ROCrate_decoderDefinedTerm), (objectArg_9 = get$.Optional, objectArg_9.Field("roles", arg_19)))), unwrap((arg_21 = Decode_resizeArray(Comment_ROCrate_decoderDisambiguatingDescription), (objectArg_10 = get$.Optional, objectArg_10.Field("comments", arg_21)))));
+    return new Person(unwrap((objectArg = get$.Optional, objectArg.Field("orcid", string))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("lastName", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("firstName", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("midInitials", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("email", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("phone", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("fax", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("address", string))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("affiliation", ROCrate_Affiliation_decoder))), unwrap((arg_19 = resizeArray(OntologyAnnotation_ROCrate_decoderDefinedTerm), (objectArg_9 = get$.Optional, objectArg_9.Field("roles", arg_19)))), unwrap((arg_21 = resizeArray(ROCrate_decoderDisambiguatingDescription), (objectArg_10 = get$.Optional, objectArg_10.Field("comments", arg_21)))));
 });
 
 /**
  * This is only used for ro-crate creation. In ISA publication authors are only a string. ro-crate requires person object.
  * Therefore, we try to split the string by common separators and create a minimal person object for ro-crate.
  */
-export function Person_ROCrate_encodeAuthorListString(authorList) {
-    return new Json(6, [map((name) => (new Json(5, [choose((tupledArg) => {
-        const v = tupledArg[1];
-        if (equals(v, new Json(3, []))) {
-            return void 0;
-        }
-        else {
-            return [tupledArg[0], v];
-        }
-    }, ofArray([["@type", new Json(0, ["Person"])], tryInclude("name", (value_1) => (new Json(0, [value_1])), name), ["@context", contextMinimal_jsonValue]]))])), map((s) => s.trim(), split(authorList, [(authorList.indexOf("\t") >= 0) ? "\t" : ((authorList.indexOf(";") >= 0) ? ";" : ",")], void 0, 0)))]);
+export function ROCrate_encodeAuthorListString(authorList) {
+    const values_2 = map_2((name) => {
+        const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@type", {
+            Encode(helpers) {
+                return helpers.encodeString("Person");
+            },
+        }], tryInclude("name", (value_1) => ({
+            Encode(helpers_1) {
+                return helpers_1.encodeString(value_1);
+            },
+        }), name), ["@context", contextMinimal_jsonValue]]));
+        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);
+            },
+        };
+    }, map_2((s) => s.trim(), split(authorList, [(authorList.indexOf("\t") >= 0) ? "\t" : ((authorList.indexOf(";") >= 0) ? ";" : ",")], undefined, 0)));
+    return {
+        Encode(helpers_3) {
+            const arg_1 = map_2((v_3) => v_3.Encode(helpers_3), values_2);
+            return helpers_3.encodeArray(arg_1);
+        },
+    };
 }
 
-export const Person_ROCrate_decodeAuthorListString = map_1((v) => join(", ", v), array_2(object((get$) => {
+export const ROCrate_decodeAuthorListString = map_3((v) => join(", ", v), array_3(object((get$) => {
     let objectArg;
     return defaultArg((objectArg = get$.Optional, objectArg.Field("name", string)), "");
 })));
 
-export const Person_ISAJson_allowedFields = ofArray(["@id", "firstName", "lastName", "midInitials", "email", "phone", "fax", "address", "affiliation", "roles", "comments", "@type", "@context"]);
+export const ISAJson_allowedFields = ofArray(["@id", "firstName", "lastName", "midInitials", "email", "phone", "fax", "address", "affiliation", "roles", "comments", "@type", "@context"]);
 
-export function Person_ISAJson_encoder(idMap, person) {
+export function ISAJson_encoder(idMap, person) {
     const f = (person_1) => {
         const person_2 = Person_setCommentFromORCID(person_1);
-        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])), Person_ROCrate_genID(person_2)), tryInclude("firstName", (value_2) => (new Json(0, [value_2])), person_2.FirstName), tryInclude("lastName", (value_4) => (new Json(0, [value_4])), person_2.LastName), tryInclude("midInitials", (value_6) => (new Json(0, [value_6])), person_2.MidInitials), tryInclude("email", (value_8) => (new Json(0, [value_8])), person_2.EMail), tryInclude("phone", (value_10) => (new Json(0, [value_10])), person_2.Phone), tryInclude("fax", (value_12) => (new Json(0, [value_12])), person_2.Fax), tryInclude("address", (value_14) => (new Json(0, [value_14])), person_2.Address), tryInclude("affiliation", (value_16) => (new Json(0, [value_16])), person_2.Affiliation), tryIncludeSeq("roles", OntologyAnnotation_encoder, person_2.Roles), tryIncludeSeq("comments", Comment_encoder, person_2.Comments)]))]);
+        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(person_2)), tryInclude("firstName", (value_2) => ({
+            Encode(helpers_1) {
+                return helpers_1.encodeString(value_2);
+            },
+        }), person_2.FirstName), tryInclude("lastName", (value_4) => ({
+            Encode(helpers_2) {
+                return helpers_2.encodeString(value_4);
+            },
+        }), person_2.LastName), tryInclude("midInitials", (value_6) => ({
+            Encode(helpers_3) {
+                return helpers_3.encodeString(value_6);
+            },
+        }), person_2.MidInitials), tryInclude("email", (value_8) => ({
+            Encode(helpers_4) {
+                return helpers_4.encodeString(value_8);
+            },
+        }), person_2.EMail), tryInclude("phone", (value_10) => ({
+            Encode(helpers_5) {
+                return helpers_5.encodeString(value_10);
+            },
+        }), person_2.Phone), tryInclude("fax", (value_12) => ({
+            Encode(helpers_6) {
+                return helpers_6.encodeString(value_12);
+            },
+        }), person_2.Fax), tryInclude("address", (value_14) => ({
+            Encode(helpers_7) {
+                return helpers_7.encodeString(value_14);
+            },
+        }), person_2.Address), tryInclude("affiliation", (value_16) => ({
+            Encode(helpers_8) {
+                return helpers_8.encodeString(value_16);
+            },
+        }), person_2.Affiliation), tryIncludeSeq("roles", OntologyAnnotation_encoder, person_2.Roles), tryIncludeSeq("comments", encoder_1, person_2.Comments)]));
+        return {
+            Encode(helpers_9) {
+                const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values);
+                return helpers_9.encodeObject(arg);
+            },
+        };
     };
     if (idMap != null) {
-        return encode(Person_ROCrate_genID, f, person, idMap);
+        return encode(ROCrate_genID, f, person, idMap);
     }
     else {
         return f(person);
     }
 }
 
-export const Person_ISAJson_decoder = Decode_objectNoAdditionalProperties(Person_ISAJson_allowedFields, (get$) => {
+export const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedFields, (get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, objectArg_6, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9;
-    return Person_setOrcidFromComments(new Person(void 0, unwrap((objectArg = get$.Optional, objectArg.Field("lastName", string))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("firstName", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("midInitials", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("email", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("phone", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("fax", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("address", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("affiliation", string))), unwrap((arg_17 = Decode_resizeArray(OntologyAnnotation_decoder), (objectArg_8 = get$.Optional, objectArg_8.Field("roles", arg_17)))), unwrap((arg_19 = Decode_resizeArray(Comment_decoder), (objectArg_9 = get$.Optional, objectArg_9.Field("comments", arg_19))))));
+    return Person_setOrcidFromComments(new Person(undefined, unwrap((objectArg = get$.Optional, objectArg.Field("lastName", string))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("firstName", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("midInitials", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("email", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("phone", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("fax", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("address", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("affiliation", string))), unwrap((arg_17 = resizeArray(OntologyAnnotation_decoder), (objectArg_8 = get$.Optional, objectArg_8.Field("roles", arg_17)))), unwrap((arg_19 = resizeArray(decoder_1), (objectArg_9 = get$.Optional, objectArg_9.Field("comments", arg_19))))));
 });
 
-export function ARCtrl_Person__Person_fromJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Person_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_Person__Person_toJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = Person_encoder(obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Person__Person_toJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Person__Person_toJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-
-export function ARCtrl_Person__Person_fromROCrateJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Person_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_Person__Person_toROCrateJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = Person_ROCrate_encoder(obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Person__Person_toROCrateJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Person__Person_toROCrateJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-
-export function ARCtrl_Person__Person_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Person_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_Person__Person_toISAJsonString_Static_Z3B036AA(spaces, useIDReferencing) {
-    const idMap = defaultArg(useIDReferencing, false) ? (new Map([])) : void 0;
-    return (obj) => {
-        const value = Person_ISAJson_encoder(idMap, obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Person__Person_toISAJsonString_Z3B036AA(this$, spaces, useIDReferencing) {
-    return ARCtrl_Person__Person_toISAJsonString_Static_Z3B036AA(unwrap(spaces), unwrap(useIDReferencing))(this$);
-}
-

package/Json/Process/AssayMaterials.js

@@ -1,22 +1,20 @@
 import { getMaterials, getSamples } from "../../Core/Process/ProcessSequence.js";
-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 { ofArray, choose } from "../../fable_modules/fable-library-js.4.22.0/List.js";
+import { map } from "../../fable_modules/fable-library-js.4.22.0/Option.js";
 import { tryIncludeList } from "../Encode.js";
-import { Sample_ISAJson_encoder } from "./Sample.js";
-import { Material_ISAJson_encoder } from "./Material.js";
+import { ISAJson_encoder } from "./Sample.js";
+import { ISAJson_encoder as ISAJson_encoder_1 } from "./Material.js";
+import { map as map_1 } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
 
 export function encoder(idMap, ps) {
     const samples = getSamples(ps);
     const materials = getMaterials(ps);
-    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([tryIncludeList("samples", (oa) => Sample_ISAJson_encoder(idMap, oa), samples), tryIncludeList("otherMaterials", (c) => Material_ISAJson_encoder(idMap, c), materials)]))]);
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryIncludeList("samples", (oa) => ISAJson_encoder(idMap, oa), samples), tryIncludeList("otherMaterials", (c) => ISAJson_encoder_1(idMap, c), materials)]));
+    return {
+        Encode(helpers) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers)], values);
+            return helpers.encodeObject(arg);
+        },
+    };
 }
 

package/Json/Process/Component.js

@@ -1,45 +1,43 @@
-import { genID, decoder as decoder_1, encoder } from "../PropertyValue.js";
+import { genID, decoder, encoder } from "../PropertyValue.js";
 import { Component, Component_decomposeName_Z721C83C5, Component__get_ComponentName, Component_createAsPV } from "../../Core/Process/Component.js";
-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 { ofArray, choose } from "../../fable_modules/fable-library-js.4.22.0/List.js";
+import { map } from "../../fable_modules/fable-library-js.4.22.0/Option.js";
+import { tryInclude } from "../Encode.js";
 import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_ISAJson_encoder } from "../OntologyAnnotation.js";
-import { object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { map as map_1 } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
+import { object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { Decode_uri } 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.16.0/String.js";
-import { unwrap, defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
-import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
 
-export const Component_ROCrate_encoder = encoder;
+export const ROCrate_encoder = encoder;
 
-export const Component_ROCrate_decoder = decoder_1(Component_createAsPV);
+export const ROCrate_decoder = decoder(Component_createAsPV);
 
-export function Component_ISAJson_genID(c) {
+export function ISAJson_genID(c) {
     return genID(c);
 }
 
-export function Component_ISAJson_encoder(idMap, c) {
-    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("componentName", (value) => (new Json(0, [value])), Component__get_ComponentName(c)), tryInclude("componentType", (oa) => OntologyAnnotation_ISAJson_encoder(idMap, oa), c.ComponentType)]))]);
+export function ISAJson_encoder(idMap, c) {
+    const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("componentName", (value) => ({
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
+    }), Component__get_ComponentName(c)), tryInclude("componentType", (oa) => OntologyAnnotation_ISAJson_encoder(idMap, oa), c.ComponentType)]));
+    return {
+        Encode(helpers_1) {
+            const arg = map_1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_1)], values);
+            return helpers_1.encodeObject(arg);
+        },
+    };
 }
 
-export const Component_ISAJson_decoder = object((get$) => {
+export const ISAJson_decoder = object((get$) => {
     let objectArg_1;
     let name;
     const objectArg = get$.Optional;
     name = objectArg.Field("componentName", Decode_uri);
     let patternInput_1;
     if (name == null) {
-        patternInput_1 = [void 0, void 0];
+        patternInput_1 = [undefined, undefined];
     }
     else {
         const patternInput = Component_decomposeName_Z721C83C5(name);
@@ -48,46 +46,3 @@ export const Component_ISAJson_decoder = object((get$) => {
     return new Component(patternInput_1[0], patternInput_1[1], (objectArg_1 = get$.Optional, objectArg_1.Field("componentType", OntologyAnnotation_ISAJson_decoder)));
 });
 
-export function ARCtrl_Process_Component__Component_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Component_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_Process_Component__Component_toISAJsonString_Static_Z3B036AA(spaces, useIDReferencing) {
-    const idMap = defaultArg(useIDReferencing, false) ? (new Map([])) : void 0;
-    return (f) => {
-        const value = Component_ISAJson_encoder(idMap, f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Process_Component__Component_toISAJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Process_Component__Component_toISAJsonString_Static_Z3B036AA(spaces)(this$);
-}
-
-export function ARCtrl_Process_Component__Component_fromROCrateJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Component_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_Process_Component__Component_toROCrateJsonString_Static_71136F3F(spaces) {
-    return (f) => {
-        const value = Component_ROCrate_encoder(f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Process_Component__Component_toROCrateJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Process_Component__Component_toROCrateJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-