@nfdi4plants/arctrl 2.0.1 → 2.1.0-alpha.2

package/Json/Process/Factor.js

@@ -1,19 +1,14 @@
 import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ROCrate_genID } from "../OntologyAnnotation.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, tryIncludeSeq, tryInclude } from "../Encode.js";
-import { Comment_ISAJson_decoder, Comment_ISAJson_encoder } from "../Comment.js";
-import { unwrap, defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { ofArray, choose } from "../../fable_modules/fable-library-js.4.22.0/List.js";
+import { defaultArg, map } from "../../fable_modules/fable-library-js.4.22.0/Option.js";
+import { tryIncludeSeq, tryInclude } from "../Encode.js";
+import { ISAJson_decoder, ISAJson_encoder } from "../Comment.js";
+import { map as map_1 } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
 import { encode } from "../IDTable.js";
-import { string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
-import { Decode_resizeArray } from "../Decode.js";
+import { resizeArray, string, object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { Factor } from "../../Core/Process/Factor.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";
 
-export function Factor_ISAJson_genID(f) {
+export function genID(f) {
     const matchValue = f.Name;
     if (matchValue == null) {
         const matchValue_1 = f.FactorType;
@@ -29,47 +24,34 @@ export function Factor_ISAJson_genID(f) {
     }
 }
 
-export function Factor_ISAJson_encoder(idMap, value) {
-    const f_1 = (value_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_2) => (new Json(0, [value_2])), Factor_ISAJson_genID(value_1)), tryInclude("factorName", (value_4) => (new Json(0, [value_4])), value_1.Name), tryInclude("factorType", (oa) => OntologyAnnotation_ISAJson_encoder(idMap, oa), value_1.FactorType), tryIncludeSeq("comments", (comment) => Comment_ISAJson_encoder(idMap, comment), defaultArg(value_1.Comments, []))]))]));
+export function encoder(idMap, value) {
+    const f_1 = (value_1) => {
+        const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value_2) => ({
+            Encode(helpers) {
+                return helpers.encodeString(value_2);
+            },
+        }), genID(value_1)), tryInclude("factorName", (value_4) => ({
+            Encode(helpers_1) {
+                return helpers_1.encodeString(value_4);
+            },
+        }), value_1.Name), tryInclude("factorType", (oa) => OntologyAnnotation_ISAJson_encoder(idMap, oa), value_1.FactorType), tryIncludeSeq("comments", (comment) => ISAJson_encoder(idMap, comment), defaultArg(value_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(Factor_ISAJson_genID, f_1, value, idMap);
+        return encode(genID, f_1, value, idMap);
     }
     else {
         return f_1(value);
     }
 }
 
-export const Factor_ISAJson_decoder = object((get$) => {
+export const decoder = object((get$) => {
     let objectArg, objectArg_1, arg_5, objectArg_2;
-    return new Factor((objectArg = get$.Optional, objectArg.Field("factorName", string)), (objectArg_1 = get$.Optional, objectArg_1.Field("factorType", OntologyAnnotation_ISAJson_decoder)), (arg_5 = Decode_resizeArray(Comment_ISAJson_decoder), (objectArg_2 = get$.Optional, objectArg_2.Field("comments", arg_5))));
+    return new Factor((objectArg = get$.Optional, objectArg.Field("factorName", string)), (objectArg_1 = get$.Optional, objectArg_1.Field("factorType", OntologyAnnotation_ISAJson_decoder)), (arg_5 = resizeArray(ISAJson_decoder), (objectArg_2 = get$.Optional, objectArg_2.Field("comments", arg_5))));
 });
 
-export function ARCtrl_Process_Factor__Factor_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Factor_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_Factor__Factor_toISAJsonString_Static_71136F3F(spaces) {
-    return (f) => {
-        const value = Factor_ISAJson_encoder(void 0, f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Process_Factor__Factor_ToISAJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Process_Factor__Factor_toISAJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-

package/Json/Process/FactorValue.js

@@ -1,70 +1,48 @@
-import { genID, decoder as decoder_1, encoder } from "../PropertyValue.js";
+import { genID, decoder, encoder } from "../PropertyValue.js";
 import { FactorValue, FactorValue_createAsPV } from "../../Core/Process/FactorValue.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 { Factor_ISAJson_decoder, Factor_ISAJson_encoder } from "./Factor.js";
-import { Value_ISAJson_decoder, Value_ISAJson_encoder } from "./Value.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 { decoder as decoder_1, encoder as encoder_1 } from "./Factor.js";
+import { decoder as decoder_2, encoder as encoder_2 } from "./Value.js";
 import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_ISAJson_encoder } from "../OntologyAnnotation.js";
+import { map as map_1 } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
 import { encode } from "../IDTable.js";
-import { object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.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 FactorValue_ROCrate_encoder = encoder;
+export const ROCrate_encoder = encoder;
 
-export const FactorValue_ROCrate_decoder = decoder_1(FactorValue_createAsPV);
+export const ROCrate_decoder = decoder(FactorValue_createAsPV);
 
-export function FactorValue_ISAJson_genID(fv) {
+export function ISAJson_genID(fv) {
     return genID(fv);
 }
 
-export function FactorValue_ISAJson_encoder(idMap, fv) {
-    const f = (fv_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])), FactorValue_ISAJson_genID(fv_1)), tryInclude("category", (value_2) => Factor_ISAJson_encoder(idMap, value_2), fv_1.Category), tryInclude("value", (value_3) => Value_ISAJson_encoder(idMap, value_3), fv_1.Value), tryInclude("unit", (oa) => OntologyAnnotation_ISAJson_encoder(idMap, oa), fv_1.Unit)]))]));
+export function ISAJson_encoder(idMap, fv) {
+    const f = (fv_1) => {
+        const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value) => ({
+            Encode(helpers) {
+                return helpers.encodeString(value);
+            },
+        }), ISAJson_genID(fv_1)), tryInclude("category", (value_2) => encoder_1(idMap, value_2), fv_1.Category), tryInclude("value", (value_3) => encoder_2(idMap, value_3), fv_1.Value), tryInclude("unit", (oa) => OntologyAnnotation_ISAJson_encoder(idMap, oa), fv_1.Unit)]));
+        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);
+            },
+        };
+    };
     if (idMap != null) {
-        return encode(FactorValue_ISAJson_genID, f, fv, idMap);
+        return encode(ISAJson_genID, f, fv, idMap);
     }
     else {
         return f(fv);
     }
 }
 
-export const FactorValue_ISAJson_decoder = object((get$) => {
+export const ISAJson_decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3;
-    return new FactorValue((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("category", Factor_ISAJson_decoder)), (objectArg_2 = get$.Optional, objectArg_2.Field("value", Value_ISAJson_decoder)), (objectArg_3 = get$.Optional, objectArg_3.Field("unit", OntologyAnnotation_ISAJson_decoder)));
+    return new FactorValue((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("category", decoder_1)), (objectArg_2 = get$.Optional, objectArg_2.Field("value", decoder_2)), (objectArg_3 = get$.Optional, objectArg_3.Field("unit", OntologyAnnotation_ISAJson_decoder)));
 });
 
-export function ARCtrl_Process_FactorValue__FactorValue_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(FactorValue_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_FactorValue__FactorValue_toISAJsonString_Static_Z3B036AA(spaces, useIDReferencing) {
-    const idMap = defaultArg(useIDReferencing, false) ? (new Map([])) : void 0;
-    return (f) => {
-        const value = FactorValue_ISAJson_encoder(idMap, f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Process_FactorValue__FactorValue_ToISAJsonString_Z3B036AA(this$, spaces, useIDReferencing) {
-    return ARCtrl_Process_FactorValue__FactorValue_toISAJsonString_Static_Z3B036AA(unwrap(spaces), unwrap(useIDReferencing))(this$);
-}
-

package/Json/Process/Material.js

@@ -1,21 +1,18 @@
-import { printf, toText, replace } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { ofArray, singleton, 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 { list as list_1 } from "../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
-import { defaultSpaces, tryIncludeListOpt, tryInclude } from "../Encode.js";
-import { MaterialType_ISAJson_decoder, MaterialType_ISAJson_encoder, MaterialType_ROCrate_decoder, MaterialType_ROCrate_encoder } from "./MaterialType.js";
-import { MaterialAttributeValue_ISAJson_decoder, MaterialAttributeValue_ISAJson_encoder, MaterialAttributeValue_ROCrate_decoder, MaterialAttributeValue_ROCrate_encoder } from "./MaterialAttributeValue.js";
+import { replace } from "../../fable_modules/fable-library-js.4.22.0/String.js";
+import { ofArray, singleton, 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 { list as list_1 } from "../../fable_modules/Thoth.Json.Core.0.4.0/Encode.fs.js";
+import { tryIncludeListOpt, tryInclude } from "../Encode.js";
+import { ISAJson_decoder as ISAJson_decoder_1, ISAJson_encoder as ISAJson_encoder_1, ROCrate_decoder as ROCrate_decoder_1, ROCrate_encoder as ROCrate_encoder_1 } from "./MaterialType.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 } from "./MaterialAttributeValue.js";
 import { context_jsonvalue } from "../context/rocrate/isa_material_context.js";
-import { list as list_2, string, 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 { list as list_2, string, object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { Decode_objectNoAdditionalProperties, Decode_uri } from "../Decode.js";
 import { Material } from "../../Core/Process/Material.js";
 import { encode } from "../IDTable.js";
-import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.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 function Material_ROCrate_genID(m) {
+export function ROCrate_genID(m) {
     const matchValue = m.ID;
     if (matchValue == null) {
         const matchValue_1 = m.Name;
@@ -31,94 +28,70 @@ export function Material_ROCrate_genID(m) {
     }
 }
 
-export function Material_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, [Material_ROCrate_genID(oa)])], ["@type", list_1(singleton(new Json(0, ["Material"])))], tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", MaterialType_ROCrate_encoder, oa.MaterialType), tryIncludeListOpt("characteristics", MaterialAttributeValue_ROCrate_encoder, oa.Characteristics), tryIncludeListOpt("derivesFrom", Material_ROCrate_encoder, oa.DerivesFrom), ["@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("Material");
+        },
+    }))], tryInclude("name", (value_2) => ({
+        Encode(helpers_2) {
+            return helpers_2.encodeString(value_2);
+        },
+    }), oa.Name), tryInclude("type", ROCrate_encoder_1, oa.MaterialType), tryIncludeListOpt("characteristics", ROCrate_encoder_2, oa.Characteristics), tryIncludeListOpt("derivesFrom", ROCrate_encoder, oa.DerivesFrom), ["@context", context_jsonvalue]]));
+    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 const Material_ROCrate_decoder = (() => {
+export const ROCrate_decoder = (() => {
     const decode = () => object((get$) => {
         let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4;
-        return new Material((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (objectArg_2 = get$.Optional, objectArg_2.Field("type", MaterialType_ROCrate_decoder)), (arg_7 = list_2(MaterialAttributeValue_ROCrate_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("characteristics", arg_7))), (arg_9 = list_2(decode()), (objectArg_4 = get$.Optional, objectArg_4.Field("derivesFrom", arg_9))));
+        return new Material((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (objectArg_2 = get$.Optional, objectArg_2.Field("type", ROCrate_decoder_1)), (arg_7 = list_2(ROCrate_decoder_2), (objectArg_3 = get$.Optional, objectArg_3.Field("characteristics", arg_7))), (arg_9 = list_2(decode()), (objectArg_4 = get$.Optional, objectArg_4.Field("derivesFrom", arg_9))));
     });
     return decode();
 })();
 
-export function Material_ISAJson_encoder(idMap, c) {
-    const f = (oa) => (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])), Material_ROCrate_genID(oa)), tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", MaterialType_ISAJson_encoder, oa.MaterialType), tryIncludeListOpt("characteristics", (oa_1) => MaterialAttributeValue_ISAJson_encoder(idMap, oa_1), oa.Characteristics), tryIncludeListOpt("derivesFrom", (c_1) => Material_ISAJson_encoder(idMap, c_1), oa.DerivesFrom)]))]));
+export function ISAJson_encoder(idMap, c) {
+    const f = (oa) => {
+        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)), tryInclude("name", (value_2) => ({
+            Encode(helpers_1) {
+                return helpers_1.encodeString(value_2);
+            },
+        }), oa.Name), tryInclude("type", ISAJson_encoder_1, oa.MaterialType), tryIncludeListOpt("characteristics", (oa_1) => ISAJson_encoder_2(idMap, oa_1), oa.Characteristics), tryIncludeListOpt("derivesFrom", (c_1) => ISAJson_encoder(idMap, c_1), oa.DerivesFrom)]));
+        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(Material_ROCrate_genID, f, c, idMap);
+        return encode(ROCrate_genID, f, c, idMap);
     }
     else {
         return f(c);
     }
 }
 
-export const Material_ISAJson_allowedFields = ofArray(["@id", "@type", "name", "type", "characteristics", "derivesFrom", "@context"]);
+export const ISAJson_allowedFields = ofArray(["@id", "@type", "name", "type", "characteristics", "derivesFrom", "@context"]);
 
-export const Material_ISAJson_decoder = (() => {
-    const decode = () => Decode_objectNoAdditionalProperties(Material_ISAJson_allowedFields, (get$) => {
+export const ISAJson_decoder = (() => {
+    const decode = () => Decode_objectNoAdditionalProperties(ISAJson_allowedFields, (get$) => {
         let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4;
-        return new Material((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (objectArg_2 = get$.Optional, objectArg_2.Field("type", MaterialType_ISAJson_decoder)), (arg_7 = list_2(MaterialAttributeValue_ISAJson_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("characteristics", arg_7))), (arg_9 = list_2(decode()), (objectArg_4 = get$.Optional, objectArg_4.Field("derivesFrom", arg_9))));
+        return new Material((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (objectArg_2 = get$.Optional, objectArg_2.Field("type", ISAJson_decoder_1)), (arg_7 = list_2(ISAJson_decoder_2), (objectArg_3 = get$.Optional, objectArg_3.Field("characteristics", arg_7))), (arg_9 = list_2(decode()), (objectArg_4 = get$.Optional, objectArg_4.Field("derivesFrom", arg_9))));
     });
     return decode();
 })();
 
-export function ARCtrl_Process_Material__Material_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Material_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_Material__Material_toISAJsonString_Static_Z3B036AA(spaces, useIDReferencing) {
-    const idMap = defaultArg(useIDReferencing, false) ? (new Map([])) : void 0;
-    return (f) => {
-        const value = Material_ISAJson_encoder(idMap, f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Process_Material__Material_ToISAJsonString_Z3B036AA(this$, spaces, useIDReferencing) {
-    return ARCtrl_Process_Material__Material_toISAJsonString_Static_Z3B036AA(unwrap(spaces), unwrap(useIDReferencing))(this$);
-}
-
-export function ARCtrl_Process_Material__Material_fromROCrateJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(Material_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_Material__Material_toROCrateJsonString_Static_71136F3F(spaces) {
-    return (f) => {
-        const value = Material_ROCrate_encoder(f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Process_Material__Material_ToROCrateJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Process_Material__Material_toROCrateJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-

package/Json/Process/MaterialAttribute.js

@@ -1,17 +1,13 @@
 import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ROCrate_genID } from "../OntologyAnnotation.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 { map as map_1 } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
 import { encode } from "../IDTable.js";
-import { object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { MaterialAttribute } from "../../Core/Process/MaterialAttribute.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 function MaterialAttribute_ISAJson_genID(m) {
+export function genID(m) {
     const matchValue = m.CharacteristicType;
     if (matchValue == null) {
         return "#EmptyFactor";
@@ -21,48 +17,30 @@ export function MaterialAttribute_ISAJson_genID(m) {
     }
 }
 
-export function MaterialAttribute_ISAJson_encoder(idMap, value) {
-    const f = (value_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_2) => (new Json(0, [value_2])), MaterialAttribute_ISAJson_genID(value_1)), tryInclude("characteristicType", (oa) => OntologyAnnotation_ISAJson_encoder(idMap, oa), value_1.CharacteristicType)]))]));
+export function encoder(idMap, value) {
+    const f = (value_1) => {
+        const values = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value_2) => ({
+            Encode(helpers) {
+                return helpers.encodeString(value_2);
+            },
+        }), genID(value_1)), tryInclude("characteristicType", (oa) => OntologyAnnotation_ISAJson_encoder(idMap, oa), value_1.CharacteristicType)]));
+        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);
+            },
+        };
+    };
     if (idMap != null) {
-        return encode(MaterialAttribute_ISAJson_genID, f, value, idMap);
+        return encode(genID, f, value, idMap);
     }
     else {
         return f(value);
     }
 }
 
-export const MaterialAttribute_ISAJson_decoder = object((get$) => {
+export const decoder = object((get$) => {
     let objectArg;
-    return new MaterialAttribute(void 0, (objectArg = get$.Optional, objectArg.Field("characteristicType", OntologyAnnotation_ISAJson_decoder)));
+    return new MaterialAttribute(undefined, (objectArg = get$.Optional, objectArg.Field("characteristicType", OntologyAnnotation_ISAJson_decoder)));
 });
 
-export function ARCtrl_Process_MaterialAttribute__MaterialAttribute_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(MaterialAttribute_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_MaterialAttribute__MaterialAttribute_toISAJsonString_Static_Z3B036AA(spaces, useIDReferencing) {
-    const idMap = defaultArg(useIDReferencing, false) ? (new Map([])) : void 0;
-    return (v) => {
-        const value = MaterialAttribute_ISAJson_encoder(idMap, v);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Process_MaterialAttribute__MaterialAttribute_ToJsonString_Z3B036AA(this$, spaces, useIDReferencing) {
-    return ARCtrl_Process_MaterialAttribute__MaterialAttribute_toISAJsonString_Static_Z3B036AA(unwrap(spaces), unwrap(useIDReferencing))(this$);
-}
-

package/Json/Process/MaterialAttributeValue.js

@@ -1,91 +1,48 @@
-import { genID, decoder as decoder_1, encoder } from "../PropertyValue.js";
+import { genID, decoder, encoder } from "../PropertyValue.js";
 import { MaterialAttributeValue, MaterialAttributeValue_createAsPV } from "../../Core/Process/MaterialAttributeValue.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 { MaterialAttribute_ISAJson_decoder, MaterialAttribute_ISAJson_encoder } from "./MaterialAttribute.js";
-import { Value_ISAJson_decoder, Value_ISAJson_encoder } from "./Value.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 { decoder as decoder_1, encoder as encoder_1 } from "./MaterialAttribute.js";
+import { decoder as decoder_2, encoder as encoder_2 } from "./Value.js";
 import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_ISAJson_encoder } from "../OntologyAnnotation.js";
+import { map as map_1 } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
 import { encode } from "../IDTable.js";
-import { object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.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 MaterialAttributeValue_ROCrate_encoder = encoder;
+export const ROCrate_encoder = encoder;
 
-export const MaterialAttributeValue_ROCrate_decoder = decoder_1(MaterialAttributeValue_createAsPV);
+export const ROCrate_decoder = decoder(MaterialAttributeValue_createAsPV);
 
-export function MaterialAttributeValue_ISAJson_genID(oa) {
+export function ISAJson_genID(oa) {
     return genID(oa);
 }
 
-export function MaterialAttributeValue_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])), MaterialAttributeValue_ISAJson_genID(oa_1)), tryInclude("category", (value_2) => MaterialAttribute_ISAJson_encoder(idMap, value_2), oa_1.Category), tryInclude("value", (value_3) => Value_ISAJson_encoder(idMap, value_3), oa_1.Value), tryInclude("unit", (oa_3) => OntologyAnnotation_ISAJson_encoder(idMap, oa_3), oa_1.Unit)]))]));
+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);
+            },
+        }), ISAJson_genID(oa_1)), tryInclude("category", (value_2) => encoder_1(idMap, value_2), oa_1.Category), tryInclude("value", (value_3) => encoder_2(idMap, value_3), oa_1.Value), tryInclude("unit", (oa_3) => OntologyAnnotation_ISAJson_encoder(idMap, oa_3), oa_1.Unit)]));
+        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);
+            },
+        };
+    };
     if (idMap != null) {
-        return encode(MaterialAttributeValue_ISAJson_genID, f, oa, idMap);
+        return encode(ISAJson_genID, f, oa, idMap);
     }
     else {
         return f(oa);
     }
 }
 
-export const MaterialAttributeValue_ISAJson_decoder = object((get$) => {
+export const ISAJson_decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3;
-    return new MaterialAttributeValue((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("category", MaterialAttribute_ISAJson_decoder)), (objectArg_2 = get$.Optional, objectArg_2.Field("value", Value_ISAJson_decoder)), (objectArg_3 = get$.Optional, objectArg_3.Field("unit", OntologyAnnotation_ISAJson_decoder)));
+    return new MaterialAttributeValue((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("category", decoder_1)), (objectArg_2 = get$.Optional, objectArg_2.Field("value", decoder_2)), (objectArg_3 = get$.Optional, objectArg_3.Field("unit", OntologyAnnotation_ISAJson_decoder)));
 });
 
-export function ARCtrl_Process_MaterialAttributeValue__MaterialAttributeValue_fromISAJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(MaterialAttributeValue_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_MaterialAttributeValue__MaterialAttributeValue_toISAJsonString_Static_Z3B036AA(spaces, useIDReferencing) {
-    const idMap = defaultArg(useIDReferencing, false) ? (new Map([])) : void 0;
-    return (f) => {
-        const value = MaterialAttributeValue_ISAJson_encoder(idMap, f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Process_MaterialAttributeValue__MaterialAttributeValue_ToISAJsonString_Z3B036AA(this$, spaces, useIDReferencing) {
-    return ARCtrl_Process_MaterialAttributeValue__MaterialAttributeValue_toISAJsonString_Static_Z3B036AA(unwrap(spaces), unwrap(useIDReferencing))(this$);
-}
-
-export function ARCtrl_Process_MaterialAttributeValue__MaterialAttributeValue_fromROCrateJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(MaterialAttributeValue_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_MaterialAttributeValue__MaterialAttributeValue_toROCrateJsonString_Static_71136F3F(spaces) {
-    return (f) => {
-        const value = MaterialAttributeValue_ROCrate_encoder(f);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_Process_MaterialAttributeValue__MaterialAttributeValue_ToROCrateJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_Process_MaterialAttributeValue__MaterialAttributeValue_toROCrateJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-