@nfdi4plants/arctrl 3.0.0-beta.4 → 3.0.0-beta.6

package/dist/ts/ts/Json/Encode.js

@@ -1,8 +1,9 @@
-import { defaultArg, map, value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
-import { isEmpty, map as map$2, toArray } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { map, value, defaultArg } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { Json_Object } from '../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
+import { isEmpty, map as map$1, append, toArray } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { seq, list, tuple2 } from '../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
-import { item } from '../../node_modules/@fable-org/fable-library-js/Array.js';
-import { isEmpty as isEmpty$1, map as map$1 } from '../../node_modules/@fable-org/fable-library-js/List.js';
+import { map as map$2, item } from '../../node_modules/@fable-org/fable-library-js/Array.js';
+import { isEmpty as isEmpty$1, map as map$3 } from '../../node_modules/@fable-org/fable-library-js/List.js';
 import { toString } from '../../node_modules/@fable-org/fable-library-js/Date.js';
 import { count } from '../../node_modules/@fable-org/fable-library-js/CollectionUtil.js';
 import { toFail, printf } from '../../node_modules/@fable-org/fable-library-js/String.js';
@@ -11,32 +12,63 @@ function tryInclude(name, encoder, value) {
   return [name, map(encoder, value)];
 }
 function tryIncludeSeq(name, encoder, value) {
-  return [name, isEmpty(value) ? void 0 : seq(map$2(encoder, value))];
+  return [name, isEmpty(value) ? void 0 : seq(map$1(encoder, value))];
+}
+function tryIncludeArray(name, encoder, value) {
+  let values;
+  return [name, value.length === 0 ? void 0 : (values = map$2(encoder, value), {
+    Encode(helpers) {
+      const arg = map$2((v) => v.Encode(helpers), values);
+      return helpers.encodeArray(arg);
+    }
+  })];
 }
 function tryIncludeList(name, encoder, value) {
-  return [name, isEmpty$1(value) ? void 0 : list(map$1(encoder, value))];
+  return [name, isEmpty$1(value) ? void 0 : list(map$3(encoder, value))];
 }
 function tryIncludeListOpt(name, encoder, value$1) {
   let o;
-  return [name, value$1 != null ? (o = value(value$1), isEmpty$1(o) ? void 0 : list(map$1(encoder, o))) : void 0];
+  return [name, value$1 != null ? (o = value(value$1), isEmpty$1(o) ? void 0 : list(map$3(encoder, o))) : void 0];
 }
 const DefaultSpaces = 0;
 function defaultSpaces(spaces) {
   return defaultArg(spaces, DefaultSpaces);
 }
 function dateTime(d) {
-  const value = item(0, toString(d, "O").split("+"));
+  const value = item(0, toString(d, "O", {}).split("+"));
   return {
     Encode(helpers) {
       return helpers.encodeString(value);
     }
   };
 }
+function addPropertyToObject(name, value, obj) {
+  if (obj.tag === /* Object */
+  5) {
+    return Json_Object(append(obj.fields[0], [[name, value]]));
+  } else {
+    throw new Error("Expected object");
+  }
+}
 function resizeArrayOrSingleton(encoder, values) {
   if (values.length === 1) {
     return encoder(values[0]);
   } else {
-    return seq(map$2(encoder, values));
+    return seq(map$1(encoder, values));
+  }
+}
+function dictionary(keyEncoder, valueEncoder, values) {
+  if (count(values) === 0) {
+    return {
+      Encode(helpers) {
+        return helpers.encodeNull();
+      }
+    };
+  } else {
+    return seq(toArray(map$1((_arg) => {
+      const activePatternResult = _arg;
+      return tuple2(keyEncoder, valueEncoder, activePatternResult[0], activePatternResult[1]);
+    }, values)));
   }
 }
 function intDictionary(valueEncoder, values) {
@@ -47,7 +79,7 @@ function intDictionary(valueEncoder, values) {
       }
     };
   } else {
-    return seq(toArray(map$2((_arg) => {
+    return seq(toArray(map$1((_arg) => {
       const activePatternResult = _arg;
       const k = activePatternResult[0] | 0;
       if (k > 2147483647 ? true : k < -2147483648) {
@@ -62,4 +94,4 @@ function intDictionary(valueEncoder, values) {
   }
 }
 
-export { DefaultSpaces, dateTime, defaultSpaces, intDictionary, resizeArrayOrSingleton, tryInclude, tryIncludeList, tryIncludeListOpt, tryIncludeSeq };
+export { DefaultSpaces, addPropertyToObject, dateTime, defaultSpaces, dictionary, intDictionary, resizeArrayOrSingleton, tryInclude, tryIncludeArray, tryIncludeList, tryIncludeListOpt, tryIncludeSeq };

package/dist/ts/ts/Json/Investigation.js

@@ -1,25 +1,26 @@
-import { ofArray, unzip, empty, choose } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { value, defaultArg, unwrap, map as map$1 } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { choose, ofArray, unzip, empty } from '../../node_modules/@fable-org/fable-library-js/List.js';
+import { map, unwrap, defaultArg, value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
 import { tryInclude, tryIncludeSeq } from './Encode.js';
-import { ISAJson_decoder as ISAJson_decoder$2, decoder as decoder$1, ROCrate_decoder as ROCrate_decoder$2, encoder as encoder$1, ISAJson_encoder as ISAJson_encoder$1, ROCrate_encoder as ROCrate_encoder$1 } from './OntologySourceReference.js';
-import { ISAJson_decoder as ISAJson_decoder$3, decoder as decoder$2, ROCrate_decoder as ROCrate_decoder$3, encoder as encoder$2, ISAJson_encoder as ISAJson_encoder$2, ROCrate_encoder as ROCrate_encoder$2 } from './Publication.js';
-import { ISAJson_decoder as ISAJson_decoder$4, decoder as decoder$3, ROCrate_decoder as ROCrate_decoder$4, encoder as encoder$3, ISAJson_encoder as ISAJson_encoder$3, ROCrate_encoder as ROCrate_encoder$3 } from './Person.js';
-import { decoder as decoder$4, decoderCompressed as decoderCompressed$1, encoder as encoder$4, encoderCompressed as encoderCompressed$1 } from './Assay.js';
+import { encoder as encoder$1, decoder as decoder$1, ROCrate_encoder as ROCrate_encoder$1, ROCrate_decoder as ROCrate_decoder$2, ISAJson_encoder as ISAJson_encoder$1, ISAJson_decoder as ISAJson_decoder$2 } from './OntologySourceReference.js';
+import { encoder as encoder$2, decoder as decoder$2, ROCrate_encoder as ROCrate_encoder$2, ROCrate_decoder as ROCrate_decoder$3, ISAJson_encoder as ISAJson_encoder$2, ISAJson_decoder as ISAJson_decoder$3 } from './Publication.js';
+import { encoder as encoder$3, decoder as decoder$3, ROCrate_encoder as ROCrate_encoder$3, ROCrate_decoder as ROCrate_decoder$4, ISAJson_encoder as ISAJson_encoder$3, ISAJson_decoder as ISAJson_decoder$4 } from './Person.js';
+import { encoder as encoder$4, decoder as decoder$4, encoderCompressed as encoderCompressed$1, decoderCompressed as decoderCompressed$1 } from './Assay.js';
 import { ArcInvestigation } from '../Core/ArcTypes.js';
-import { ISAJson_decoder as ISAJson_decoder$1, decoder as decoder$5, decoderCompressed as decoderCompressed$2, ROCrate_decoder as ROCrate_decoder$1, encoder as encoder$5, ISAJson_encoder as ISAJson_encoder$4, ROCrate_encoder as ROCrate_encoder$4, encoderCompressed as encoderCompressed$2 } from './Study.js';
-import { ISAJson_decoder as ISAJson_decoder$5, decoder as decoder$6, ROCrate_decoder as ROCrate_decoder$5, encoder as encoder$6, ISAJson_encoder as ISAJson_encoder$5, ROCrate_encoder as ROCrate_encoder$5 } from './Comment.js';
-import { concat, map } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { string, list, resizeArray, object } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { encoder as encoder$5, decoder as decoder$5, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$2, ROCrate_encoder as ROCrate_encoder$4, ROCrate_decoder as ROCrate_decoder$1, ISAJson_encoder as ISAJson_encoder$4, ISAJson_decoder as ISAJson_decoder$1 } from './Study.js';
+import { encoder as encoder$6, decoder as decoder$6, ROCrate_encoder as ROCrate_encoder$5, ROCrate_decoder as ROCrate_decoder$5, ISAJson_encoder as ISAJson_encoder$5, ISAJson_decoder as ISAJson_decoder$5 } from './Comment.js';
+import { map as map$1, concat } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { object, string, resizeArray, list } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 import { stringHash } from '../../node_modules/@fable-org/fable-library-js/Util.js';
-import { toString, today } from '../../node_modules/@fable-org/fable-library-js/Date.js';
+import { today, toString } from '../../node_modules/@fable-org/fable-library-js/Date.js';
 import { context_jsonvalue } from './context/rocrate/isa_investigation_context.js';
 import { createMissingIdentifier } from '../Core/Helper/Identifier.js';
 import { distinctBy } from '../../node_modules/@fable-org/fable-library-js/Seq2.js';
+import { conformsTo_jsonvalue, context_jsonvalue as context_jsonvalue$1 } from './context/rocrate/rocrate_context.js';
 import { Decode_objectNoAdditionalProperties } from './Decode.js';
 
 function encoder(inv) {
   let value;
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["Identifier", (value = inv.Identifier, {
+  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["Identifier", (value = inv.Identifier, {
     Encode(helpers) {
       return helpers.encodeString(value);
     }
@@ -46,7 +47,7 @@ function encoder(inv) {
   }), inv.RegisteredStudyIdentifiers), tryIncludeSeq("Comments", encoder$6, inv.Comments)]));
   return {
     Encode(helpers_6) {
-      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
       return helpers_6.encodeObject(arg);
     }
   };
@@ -57,7 +58,7 @@ const decoder = object((get$) => {
 });
 function encoderCompressed(stringTable, oaTable, cellTable, inv) {
   let value;
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["Identifier", (value = inv.Identifier, {
+  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["Identifier", (value = inv.Identifier, {
     Encode(helpers) {
       return helpers.encodeString(value);
     }
@@ -84,7 +85,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, inv) {
   }), inv.RegisteredStudyIdentifiers), tryIncludeSeq("Comments", encoder$6, inv.Comments)]));
   return {
     Encode(helpers_6) {
-      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_1);
       return helpers_6.encodeObject(arg);
     }
   };
@@ -100,7 +101,7 @@ function ROCrate_genID(i) {
 }
 function ROCrate_encoder(oa) {
   let value, value_3, value_4, value_12, copyOfStruct;
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(), {
+  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(oa), {
     Encode(helpers) {
       return helpers.encodeString(value);
     }
@@ -139,7 +140,7 @@ function ROCrate_encoder(oa) {
   })], tryIncludeSeq("ontologySourceReferences", ROCrate_encoder$1, oa.OntologySourceReferences), tryIncludeSeq("publications", ROCrate_encoder$2, oa.Publications), tryIncludeSeq("people", ROCrate_encoder$3, oa.Contacts), tryIncludeSeq("studies", (s) => ROCrate_encoder$4(void 0, s), oa.Studies), tryIncludeSeq("comments", ROCrate_encoder$5, oa.Comments), ["@context", context_jsonvalue]]));
   return {
     Encode(helpers_9) {
-      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values_1);
       return helpers_9.encodeObject(arg);
     }
   };
@@ -161,14 +162,31 @@ const ROCrate_decoder = object((get$) => {
   assays = Array.from(collection);
   const studies = Array.from(studiesRaw);
   let studyIdentifiers;
-  const collection_1 = map((a_1) => a_1.Identifier, studiesRaw);
+  const collection_1 = map$1((a_1) => a_1.Identifier, studiesRaw);
   studyIdentifiers = Array.from(collection_1);
   return new ArcInvestigation(identifier, unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("title", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("description", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("submissionDate", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("publicReleaseDate", string))), unwrap((arg_13 = resizeArray(ROCrate_decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("ontologySourceReferences", arg_13))), unwrap((arg_15 = resizeArray(ROCrate_decoder$3), objectArg_7 = get$.Optional, objectArg_7.Field("publications", arg_15))), unwrap((arg_17 = resizeArray(ROCrate_decoder$4), objectArg_8 = get$.Optional, objectArg_8.Field("people", arg_17))), assays, studies, void 0, void 0, studyIdentifiers, unwrap((arg_19 = resizeArray(ROCrate_decoder$5), objectArg_9 = get$.Optional, objectArg_9.Field("comments", arg_19))));
 });
+function ROCrate_encodeRoCrate(oa) {
+  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@type", (value) => ({
+    Encode(helpers) {
+      return helpers.encodeString(value);
+    }
+  }), "CreativeWork"), tryInclude("@id", (value_2) => ({
+    Encode(helpers_1) {
+      return helpers_1.encodeString(value_2);
+    }
+  }), "ro-crate-metadata.json"), tryInclude("about", ROCrate_encoder, oa), ["conformsTo", conformsTo_jsonvalue], ["@context", context_jsonvalue$1]]));
+  return {
+    Encode(helpers_2) {
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_2)], values_1);
+      return helpers_2.encodeObject(arg);
+    }
+  };
+}
 const ISAJson_allowedFields = ofArray(["@id", "filename", "identifier", "title", "description", "submissionDate", "publicReleaseDate", "ontologySourceReferences", "publications", "people", "studies", "comments", "@type", "@context"]);
 function ISAJson_encoder(idMap, inv) {
   let value, value_1, value_2;
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(), {
+  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(inv), {
     Encode(helpers) {
       return helpers.encodeString(value);
     }
@@ -199,7 +217,7 @@ function ISAJson_encoder(idMap, inv) {
   }), inv.PublicReleaseDate), tryIncludeSeq("ontologySourceReferences", (osr) => ISAJson_encoder$1(idMap, osr), inv.OntologySourceReferences), tryIncludeSeq("publications", (oa) => ISAJson_encoder$2(idMap, oa), inv.Publications), tryIncludeSeq("people", (person) => ISAJson_encoder$3(idMap, person), inv.Contacts), tryIncludeSeq("studies", (s) => ISAJson_encoder$4(idMap, void 0, s), inv.Studies), tryIncludeSeq("comments", (comment) => ISAJson_encoder$5(idMap, comment), inv.Comments)]));
   return {
     Encode(helpers_7) {
-      const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_7)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_7)], values_1);
       return helpers_7.encodeObject(arg);
     }
   };
@@ -221,9 +239,9 @@ const ISAJson_decoder = Decode_objectNoAdditionalProperties(ISAJson_allowedField
   assays = Array.from(collection);
   const studies = Array.from(studiesRaw);
   let studyIdentifiers;
-  const collection_1 = map((a_1) => a_1.Identifier, studiesRaw);
+  const collection_1 = map$1((a_1) => a_1.Identifier, studiesRaw);
   studyIdentifiers = Array.from(collection_1);
   return new ArcInvestigation(identifer, unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("title", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("description", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("submissionDate", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("publicReleaseDate", string))), unwrap((arg_13 = resizeArray(ISAJson_decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("ontologySourceReferences", arg_13))), unwrap((arg_15 = resizeArray(ISAJson_decoder$3), objectArg_7 = get$.Optional, objectArg_7.Field("publications", arg_15))), unwrap((arg_17 = resizeArray(ISAJson_decoder$4), objectArg_8 = get$.Optional, objectArg_8.Field("people", arg_17))), assays, studies, void 0, void 0, studyIdentifiers, unwrap((arg_19 = resizeArray(ISAJson_decoder$5), objectArg_9 = get$.Optional, objectArg_9.Field("comments", arg_19))));
 });
 
-export { ISAJson_allowedFields, ISAJson_decoder, ISAJson_encoder, ROCrate_decoder, ROCrate_encoder, ROCrate_genID, decoder, decoderCompressed, encoder, encoderCompressed };
+export { ISAJson_allowedFields, ISAJson_decoder, ISAJson_encoder, ROCrate_decoder, ROCrate_encodeRoCrate, ROCrate_encoder, ROCrate_genID, decoder, decoderCompressed, encoder, encoderCompressed };

package/dist/ts/ts/Json/OntologyAnnotation.js

@@ -1,12 +1,12 @@
 import { oneOf, map, string, int, float, object, resizeArray } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 import { int32ToString } from '../../node_modules/@fable-org/fable-library-js/Util.js';
 import { ofArray, choose } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { unwrap, map as map$1, value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { map as map$1, unwrap, value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
 import { tryInclude, tryIncludeSeq } from './Encode.js';
-import { decoder, ROCrate_decoderDisambiguatingDescription, encoder, ROCrate_encoderDisambiguatingDescription } from './Comment.js';
+import { encoder, decoder, ROCrate_encoderDisambiguatingDescription, ROCrate_decoderDisambiguatingDescription } from './Comment.js';
 import { map as map$2, filter } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { OntologyAnnotation } from '../Core/OntologyAnnotation.js';
-import { decodeString, encodeString } from './StringTable.js';
+import { encodeString, decodeString } from './StringTable.js';
 import { replace } from '../../node_modules/@fable-org/fable-library-js/String.js';
 import { URIModule_toString } from '../Core/URI.js';
 import { context_jsonvalue } from './context/rocrate/isa_ontology_annotation_context.js';
@@ -141,11 +141,11 @@ function OntologyAnnotation_ISAJson_encoder(idMap, oa) {
   const f = (oa_1) => {
     const comments = filter((c) => {
       const matchValue = c.Name;
-      let matchResult;
+      let matchResult, n_1;
       if (matchValue != null) {
         if (value(matchValue) === orderName) {
           matchResult = 0;
-          value(matchValue);
+          n_1 = value(matchValue);
         } else {
           matchResult = 1;
         }

package/dist/ts/ts/Json/OntologySourceReference.js

@@ -1,7 +1,7 @@
 import { choose, ofArray } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { unwrap, map, value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { map, unwrap, value } from '../../node_modules/@fable-org/fable-library-js/Option.js';
 import { tryInclude, tryIncludeSeq } from './Encode.js';
-import { decoder as decoder$1, encoder as encoder$1, ISAJson_encoder as ISAJson_encoder$1 } from './Comment.js';
+import { encoder as encoder$1, decoder as decoder$1, ISAJson_encoder as ISAJson_encoder$1 } from './Comment.js';
 import { map as map$1 } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { OntologySourceReference } from '../Core/OntologySourceReference.js';
 import { object, string, resizeArray } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';

package/dist/ts/ts/Json/Person.js

@@ -1,21 +1,21 @@
-import { ofArray, choose } from '../../node_modules/@fable-org/fable-library-js/List.js';
-import { unwrap, map as map$1, value, defaultArg } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { choose, ofArray } from '../../node_modules/@fable-org/fable-library-js/List.js';
+import { map, unwrap, value, defaultArg } from '../../node_modules/@fable-org/fable-library-js/Option.js';
 import { tryInclude, tryIncludeSeq } from './Encode.js';
-import { OntologyAnnotation_decoder, OntologyAnnotation_ROCrate_decoderDefinedTerm, OntologyAnnotation_encoder, OntologyAnnotation_ROCrate_encoderDefinedTerm } from './OntologyAnnotation.js';
-import { decoder as decoder$1, ROCrate_decoderDisambiguatingDescription, encoder as encoder$1, ROCrate_encoderDisambiguatingDescription } from './Comment.js';
-import { map as map$2, tryPick } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { OntologyAnnotation_encoder, OntologyAnnotation_decoder, OntologyAnnotation_ROCrate_encoderDefinedTerm, OntologyAnnotation_ROCrate_decoderDefinedTerm } from './OntologyAnnotation.js';
+import { encoder as encoder$1, decoder as decoder$1, ROCrate_encoderDisambiguatingDescription, ROCrate_decoderDisambiguatingDescription } from './Comment.js';
+import { map as map$1, tryPick } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { Person } from '../Core/Person.js';
-import { string, resizeArray, object, map, array } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
-import { join, replace, split } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { context_jsonvalue as context_jsonvalue$1 } from './context/rocrate/isa_organization_context.js';
-import { context_jsonvalue, contextMinimal_jsonValue } from './context/rocrate/isa_person_context.js';
-import { map as map$3 } from '../../node_modules/@fable-org/fable-library-js/Array.js';
-import { Person_setOrcidFromComments, Person_setCommentFromORCID } from '../Core/Conversion.js';
+import { object, string, resizeArray, map as map$3, array } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { replace, split, join } from '../../node_modules/@fable-org/fable-library-js/String.js';
+import { context_jsonvalue } from './context/rocrate/isa_organization_context.js';
+import { context_jsonvalue as context_jsonvalue$1, contextMinimal_jsonValue } from './context/rocrate/isa_person_context.js';
+import { map as map$2 } from '../../node_modules/@fable-org/fable-library-js/Array.js';
+import { Person_setCommentFromORCID, Person_setOrcidFromComments } from '../Core/Conversion.js';
 import { encode } from './IDTable.js';
 import { Decode_objectNoAdditionalProperties } from './Decode.js';
 
 function encoder(person) {
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("firstName", (value) => ({
+  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("firstName", (value) => ({
     Encode(helpers) {
       return helpers.encodeString(value);
     }
@@ -54,7 +54,7 @@ function encoder(person) {
   }), person.Affiliation), tryIncludeSeq("roles", OntologyAnnotation_encoder, person.Roles), tryIncludeSeq("comments", encoder$1, person.Comments)]));
   return {
     Encode(helpers_9) {
-      const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values_1);
       return helpers_9.encodeObject(arg);
     }
   };
@@ -159,10 +159,10 @@ function ROCrate_Affiliation_encoder(affiliation) {
     Encode(helpers_2) {
       return helpers_2.encodeString(affiliation);
     }
-  }], ["@context", context_jsonvalue$1]];
+  }], ["@context", context_jsonvalue]];
   return {
     Encode(helpers_3) {
-      const arg = map$2((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_3)], values_1);
+      const arg = map$1((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_3)], values_1);
       return helpers_3.encodeObject(arg);
     }
   };
@@ -173,7 +173,7 @@ const ROCrate_Affiliation_decoder = object((get$) => {
 });
 function ROCrate_encoder(oa) {
   let value;
-  const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(oa), {
+  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@id", (value = ROCrate_genID(oa), {
     Encode(helpers) {
       return helpers.encodeString(value);
     }
@@ -213,10 +213,10 @@ function ROCrate_encoder(oa) {
     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]]));
+  }), 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$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_10)], values_1);
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_10)], values_1);
       return helpers_10.encodeObject(arg);
     }
   };
@@ -226,8 +226,8 @@ const ROCrate_decoder = object((get$) => {
   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))));
 });
 function ROCrate_encodeAuthorListString(authorList) {
-  const values_2 = map$3((name) => {
-    const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@type", {
+  const values_2 = map$2((name) => {
+    const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([["@type", {
       Encode(helpers) {
         return helpers.encodeString("Person");
       }
@@ -238,19 +238,19 @@ function ROCrate_encodeAuthorListString(authorList) {
     }), name), ["@context", contextMinimal_jsonValue]]));
     return {
       Encode(helpers_2) {
-        const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_2)], values_1);
+        const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_2)], values_1);
         return helpers_2.encodeObject(arg);
       }
     };
-  }, map$3((s) => s.trim(), split(authorList, [authorList.indexOf("	") >= 0 ? "	" : authorList.indexOf(";") >= 0 ? ";" : ","], void 0, 0)));
+  }, map$2((s) => s.trim(), split(authorList, [authorList.indexOf("	") >= 0 ? "	" : authorList.indexOf(";") >= 0 ? ";" : ","], void 0, 0)));
   return {
     Encode(helpers_3) {
-      const arg_1 = map$3((v_3) => v_3.Encode(helpers_3), values_2);
+      const arg_1 = map$2((v_3) => v_3.Encode(helpers_3), values_2);
       return helpers_3.encodeArray(arg_1);
     }
   };
 }
-const ROCrate_decodeAuthorListString = map((v) => join(", ", v), array(object((get$) => {
+const ROCrate_decodeAuthorListString = map$3((v) => join(", ", v), array(object((get$) => {
   let objectArg;
   return defaultArg((objectArg = get$.Optional, objectArg.Field("name", string)), "");
 })));
@@ -258,7 +258,7 @@ const ISAJson_allowedFields = ofArray(["@id", "firstName", "lastName", "midIniti
 function ISAJson_encoder(idMap, person) {
   const f = (person_1) => {
     const person_2 = Person_setCommentFromORCID(person_1);
-    const values_1 = choose((tupledArg) => map$1((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value) => ({
+    const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("@id", (value) => ({
       Encode(helpers) {
         return helpers.encodeString(value);
       }
@@ -297,7 +297,7 @@ function ISAJson_encoder(idMap, person) {
     }), person_2.Affiliation), tryIncludeSeq("roles", OntologyAnnotation_encoder, person_2.Roles), tryIncludeSeq("comments", encoder$1, person_2.Comments)]));
     return {
       Encode(helpers_9) {
-        const arg = map$2((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values_1);
+        const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_9)], values_1);
         return helpers_9.encodeObject(arg);
       }
     };

package/dist/ts/ts/Json/Process/Component.d.ts

@@ -1,9 +1,11 @@
-import { encoder } from '../PropertyValue.js';
-import { Component } from '../../Core/Process/Component.js';
-import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
 import { Option } from '@fable-org/fable-library-js/Option.js';
+import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
+import { Component } from '../../Core/Process/Component.js';
+import { encoder as encoder_2 } from '../PropertyValue.js';
 import { IMap } from '@fable-org/fable-library-js/Util.js';
-export declare const ROCrate_encoder: typeof encoder;
+export declare function encoder(value: Component): IEncodable;
+export declare const decoder: Decoder$1<Component>;
+export declare const ROCrate_encoder: typeof encoder_2;
 export declare const ROCrate_decoder: Decoder$1<Component>;
 export declare function ISAJson_genID(c: Component): string;
 export declare function ISAJson_encoder(idMap: Option<IMap<string, IEncodable>>, c: Component): IEncodable;

package/dist/ts/ts/Json/Process/Component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Component.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Process/Component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAyF,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACnJ,OAAO,EAAqB,SAAS,EAAE,UAAU,EAAE,MAAM,uDAAuD,CAAC;AACjH,OAAO,EAAyB,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAOtF,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAI3D,eAAO,MAAM,eAAe,gBAAU,CAAC;AAEvC,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,SAAS,CAA4C,CAAC;AAE9F,wBAAgB,aAAa,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAElD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,GAAG,UAAU,CAYjG;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,SAAS,CAc/C,CAAC"}
+{"version":3,"file":"Component.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Process/Component.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,MAAM,EAAO,MAAM,uCAAuC,CAAC;AACtF,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAOjH,OAAO,EAAyF,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEnJ,OAAO,EAA+B,OAAO,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAG3D,wBAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,CAQpD;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,SAAS,CAMvC,CAAC;AAEH,eAAO,MAAM,eAAe,kBAAY,CAAC;AAEzC,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,SAAS,CAA8C,CAAC;AAEhG,wBAAgB,aAAa,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAElD;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,GAAG,UAAU,CAYjG;AAED,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,SAAS,CAc/C,CAAC"}

package/dist/ts/ts/Json/Process/Component.js

@@ -1,15 +1,35 @@
-import { decoder, encoder } from '../PropertyValue.js';
-import { Component_decomposeName_Z721C83C5, Component, Component_createAsPV, Component__get_ComponentName } from '../../Core/Process/Component.js';
-import { value, map } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
 import { choose, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
+import { map, value } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
 import { tryInclude } from '../Encode.js';
-import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_ISAJson_encoder } from '../OntologyAnnotation.js';
+import { OntologyAnnotation_encoder, OntologyAnnotation_decoder, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from '../OntologyAnnotation.js';
+import { encoder as encoder$1, decoder as decoder$1 } from './Value.js';
 import { map as map$1 } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
+import { Component, Component_createAsPV, Component__get_ComponentName, Component_decomposeName_Z721C83C5 } from '../../Core/Process/Component.js';
 import { object } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { encoder as encoder$2, decoder as decoder$2, genID } from '../PropertyValue.js';
 import { Decode_uri } from '../Decode.js';
 
-const ROCrate_encoder = encoder;
-const ROCrate_decoder = decoder(Component_createAsPV);
+function encoder(value) {
+  const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("type", OntologyAnnotation_encoder, value.ComponentType), tryInclude("value", (value_1) => encoder$1(void 0, value_1), value.ComponentValue), tryInclude("unit", OntologyAnnotation_encoder, value.ComponentUnit)]));
+  return {
+    Encode(helpers) {
+      const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers)], values_1);
+      return helpers.encodeObject(arg);
+    }
+  };
+}
+const decoder = object((get$) => {
+  let objectArg_1, objectArg_2;
+  let ComponentType;
+  const objectArg = get$.Optional;
+  ComponentType = objectArg.Field("type", OntologyAnnotation_decoder);
+  return new Component((objectArg_1 = get$.Optional, objectArg_1.Field("value", decoder$1)), (objectArg_2 = get$.Optional, objectArg_2.Field("unit", OntologyAnnotation_decoder)), ComponentType);
+});
+const ROCrate_encoder = encoder$2;
+const ROCrate_decoder = decoder$2(Component_createAsPV);
+function ISAJson_genID(c) {
+  return genID(c);
+}
 function ISAJson_encoder(idMap, c) {
   const values_1 = choose((tupledArg) => map((v_1) => [tupledArg[0], v_1], tupledArg[1]), ofArray([tryInclude("componentName", (value) => ({
     Encode(helpers) {
@@ -38,4 +58,4 @@ const 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 { ISAJson_decoder, ISAJson_encoder, ROCrate_decoder, ROCrate_encoder };
+export { ISAJson_decoder, ISAJson_encoder, ISAJson_genID, ROCrate_decoder, ROCrate_encoder, decoder, encoder };

package/dist/ts/ts/Json/Process/Factor.js

@@ -1,9 +1,9 @@
-import { value, defaultArg, map } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
-import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ROCrate_genID } from '../OntologyAnnotation.js';
+import { value, map, defaultArg } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
+import { OntologyAnnotation_ROCrate_genID, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from '../OntologyAnnotation.js';
 import { Factor } from '../../Core/Process/Factor.js';
 import { choose, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
 import { tryInclude, tryIncludeSeq } from '../Encode.js';
-import { ISAJson_decoder, ISAJson_encoder } from '../Comment.js';
+import { ISAJson_encoder, ISAJson_decoder } from '../Comment.js';
 import { map as map$1 } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { encode } from '../IDTable.js';
 import { object, string, resizeArray } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';

package/dist/ts/ts/Json/Process/FactorValue.js

@@ -1,18 +1,18 @@
-import { decoder as decoder$2, encoder, genID } from '../PropertyValue.js';
-import { FactorValue, FactorValue_createAsPV } from '../../Core/Process/FactorValue.js';
-import { value, map } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
+import { encoder, decoder, genID } from '../PropertyValue.js';
+import { FactorValue_createAsPV, FactorValue } from '../../Core/Process/FactorValue.js';
+import { map, value } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
 import { choose, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
 import { tryInclude } from '../Encode.js';
-import { decoder, encoder as encoder$1 } from './Factor.js';
-import { decoder as decoder$1, encoder as encoder$2 } from './Value.js';
-import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_ISAJson_encoder } from '../OntologyAnnotation.js';
+import { encoder as encoder$1, decoder as decoder$1 } from './Factor.js';
+import { encoder as encoder$2, decoder as decoder$2 } from './Value.js';
+import { OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from '../OntologyAnnotation.js';
 import { map as map$1 } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { encode } from '../IDTable.js';
 import { object } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 import { Decode_uri } from '../Decode.js';
 
 const ROCrate_encoder = encoder;
-const ROCrate_decoder = decoder$2(FactorValue_createAsPV);
+const ROCrate_decoder = decoder(FactorValue_createAsPV);
 function ISAJson_genID(fv) {
   return genID(fv);
 }
@@ -38,7 +38,7 @@ function ISAJson_encoder(idMap, fv) {
 }
 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", decoder)), (objectArg_2 = get$.Optional, objectArg_2.Field("value", decoder$1)), (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 { ISAJson_decoder, ISAJson_encoder, ISAJson_genID, ROCrate_decoder, ROCrate_encoder };

package/dist/ts/ts/Json/Process/Material.js

@@ -1,15 +1,15 @@
 import { value, map } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
 import { replace } from '../../../node_modules/@fable-org/fable-library-js/String.js';
 import { Material } from '../../Core/Process/Material.js';
-import { ofArray, choose, singleton } from '../../../node_modules/@fable-org/fable-library-js/List.js';
-import { list as list$1 } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
+import { choose, ofArray, singleton } from '../../../node_modules/@fable-org/fable-library-js/List.js';
+import { list } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
 import { tryInclude, tryIncludeListOpt } from '../Encode.js';
-import { ISAJson_decoder as ISAJson_decoder$1, ROCrate_decoder as ROCrate_decoder$1, ROCrate_encoder as ROCrate_encoder$1, ISAJson_encoder as ISAJson_encoder$1 } from './MaterialType.js';
-import { ISAJson_decoder as ISAJson_decoder$2, ROCrate_decoder as ROCrate_decoder$2, ROCrate_encoder as ROCrate_encoder$2, ISAJson_encoder as ISAJson_encoder$2 } from './MaterialAttributeValue.js';
+import { ROCrate_encoder as ROCrate_encoder$1, ROCrate_decoder as ROCrate_decoder$1, ISAJson_encoder as ISAJson_encoder$1, ISAJson_decoder as ISAJson_decoder$1 } from './MaterialType.js';
+import { ROCrate_encoder as ROCrate_encoder$2, ROCrate_decoder as ROCrate_decoder$2, ISAJson_encoder as ISAJson_encoder$2, ISAJson_decoder as ISAJson_decoder$2 } from './MaterialAttributeValue.js';
 import { context_jsonvalue } from '../context/rocrate/isa_material_context.js';
 import { map as map$1 } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { string, list, object, unit } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
-import { Decode_objectNoAdditionalProperties, Decode_uri } from '../Decode.js';
+import { object, unit, string, list as list$1 } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { Decode_uri, Decode_objectNoAdditionalProperties } from '../Decode.js';
 import { encode } from '../IDTable.js';
 
 function ROCrate_genID(m) {
@@ -31,7 +31,7 @@ function ROCrate_encoder(oa) {
     Encode(helpers) {
       return helpers.encodeString(value);
     }
-  })], ["@type", list$1(singleton({
+  })], ["@type", list(singleton({
     Encode(helpers_1) {
       return helpers_1.encodeString("Material");
     }
@@ -72,7 +72,7 @@ const ROCrate_decoder = (() => {
         break;
       }
     }
-    return new Material((objectArg_2 = get$.Optional, objectArg_2.Field("@id", Decode_uri)), (objectArg_3 = get$.Optional, objectArg_3.Field("name", string)), (objectArg_4 = get$.Optional, objectArg_4.Field("type", ROCrate_decoder$1)), (arg_11 = list(ROCrate_decoder$2), objectArg_5 = get$.Optional, objectArg_5.Field("characteristics", arg_11)), (arg_13 = list(decode()), objectArg_6 = get$.Optional, objectArg_6.Field("derivesFrom", arg_13)));
+    return new Material((objectArg_2 = get$.Optional, objectArg_2.Field("@id", Decode_uri)), (objectArg_3 = get$.Optional, objectArg_3.Field("name", string)), (objectArg_4 = get$.Optional, objectArg_4.Field("type", ROCrate_decoder$1)), (arg_11 = list$1(ROCrate_decoder$2), objectArg_5 = get$.Optional, objectArg_5.Field("characteristics", arg_11)), (arg_13 = list$1(decode()), objectArg_6 = get$.Optional, objectArg_6.Field("derivesFrom", arg_13)));
   });
   return decode();
 })();
@@ -104,7 +104,7 @@ const ISAJson_allowedFields = ofArray(["@id", "@type", "name", "type", "characte
 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", ISAJson_decoder$1)), (arg_7 = list(ISAJson_decoder$2), objectArg_3 = get$.Optional, objectArg_3.Field("characteristics", arg_7)), (arg_9 = list(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$1(ISAJson_decoder$2), objectArg_3 = get$.Optional, objectArg_3.Field("characteristics", arg_7)), (arg_9 = list$1(decode()), objectArg_4 = get$.Optional, objectArg_4.Field("derivesFrom", arg_9)));
   });
   return decode();
 })();

package/dist/ts/ts/Json/Process/MaterialAttribute.js

@@ -1,5 +1,5 @@
 import { value, map } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
-import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ROCrate_genID } from '../OntologyAnnotation.js';
+import { OntologyAnnotation_ROCrate_genID, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from '../OntologyAnnotation.js';
 import { MaterialAttribute } from '../../Core/Process/MaterialAttribute.js';
 import { choose, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
 import { tryInclude } from '../Encode.js';