@nfdi4plants/arctrl 2.0.0-alpha.3 → 2.0.0-alpha.5

package/Core/Table/DataMap.js

@@ -0,0 +1,166 @@
+import { CompositeHeader, IOType } from "./CompositeHeader.js";
+import { OntologyAnnotation } from "../OntologyAnnotation.js";
+import { exists as exists_1, ofArray } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { exists } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { arrayHash, equalArrays, safeHash, equals } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
+import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
+import { SanityChecks_validate } from "./ArcTableAux.js";
+import { ArcTable } from "./ArcTable.js";
+import { class_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { Dictionary } from "../../fable_modules/fable-library-js.4.16.0/MutableMap.js";
+import { unwrap } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+
+export const DataMapAux_dataHeader = new CompositeHeader(11, [new IOType(2, [])]);
+
+export const DataMapAux_explication = new OntologyAnnotation("Clarification", "NCIT", "http://purl.obolibrary.org/obo/NCIT_C94778");
+
+export const DataMapAux_explicationHeader = new CompositeHeader(3, [DataMapAux_explication]);
+
+export const DataMapAux_unit = new OntologyAnnotation("Unit", "UO", "http://purl.obolibrary.org/obo/UO_0000000");
+
+export const DataMapAux_unitHeader = new CompositeHeader(3, [DataMapAux_unit]);
+
+export const DataMapAux_objectType = new OntologyAnnotation("Data Type", "NCIT", "http://purl.obolibrary.org/obo/NCIT_C42645");
+
+export const DataMapAux_objectTypeHeader = new CompositeHeader(3, [DataMapAux_objectType]);
+
+export const DataMapAux_descriptionHeader = new CompositeHeader(13, ["Description"]);
+
+export const DataMapAux_generatedByHeader = new CompositeHeader(13, ["Generated By"]);
+
+export const DataMapAux_allowedHeaders = ofArray([DataMapAux_dataHeader, DataMapAux_explicationHeader, DataMapAux_unitHeader, DataMapAux_objectTypeHeader, DataMapAux_descriptionHeader, DataMapAux_generatedByHeader]);
+
+export function DataMapAux_validate(headers, values, raiseException) {
+    if (exists((h) => {
+        const hasForeignHeader = !exists_1((ah) => equals(ah, h), DataMapAux_allowedHeaders);
+        if (raiseException && hasForeignHeader) {
+            toFail(printf("Header %O is not allowed in DataMap"))(h);
+        }
+        return hasForeignHeader;
+    }, headers)) {
+        return SanityChecks_validate(headers, values, raiseException);
+    }
+    else {
+        return false;
+    }
+}
+
+export class DataMap {
+    constructor(headers, values) {
+        DataMapAux_validate(headers, values, true);
+        this.table = (new ArcTable("DataMap", headers, values));
+        this.staticHash = 0;
+    }
+    Equals(obj) {
+        let dm;
+        const this$ = this;
+        return (obj instanceof DataMap) && ((dm = obj, equals(DataMap__get_Table(this$), DataMap__get_Table(dm))));
+    }
+    GetHashCode() {
+        const this$ = this;
+        return safeHash(DataMap__get_Table(this$)) | 0;
+    }
+}
+
+export function DataMap_$reflection() {
+    return class_type("ARCtrl.DataMap", void 0, DataMap);
+}
+
+export function DataMap_$ctor_ZD0829CB(headers, values) {
+    return new DataMap(headers, values);
+}
+
+export function DataMap__get_Headers(this$) {
+    return this$.table.Headers;
+}
+
+export function DataMap__get_Values(this$) {
+    return this$.table.Values;
+}
+
+export function DataMap__get_StaticHash(this$) {
+    return this$.staticHash;
+}
+
+export function DataMap__set_StaticHash_Z524259A4(this$, value) {
+    this$.staticHash = (value | 0);
+}
+
+export function DataMap_init() {
+    return DataMap_$ctor_ZD0829CB([], new Dictionary([], {
+        Equals: equalArrays,
+        GetHashCode: arrayHash,
+    }));
+}
+
+export function DataMap__AddColumns_6369C010(this$, columns, skipFillMissing) {
+    columns.forEach((c) => {
+        c.Validate(true);
+    });
+    this$.table.AddColumns(columns, void 0, void 0, unwrap(skipFillMissing));
+    DataMapAux_validate(this$.table.Headers, this$.table.Values, true);
+}
+
+export function DataMap_addColumns_6369C010(columns, skipFillMissing) {
+    return (dm) => {
+        const dm_1 = DataMap__Copy(dm);
+        DataMap__AddColumns_6369C010(dm_1, columns, unwrap(skipFillMissing));
+        return dm_1;
+    };
+}
+
+export function DataMap__get_Table(this$) {
+    return this$.table;
+}
+
+export function DataMap__TryGetCellAt_Z37302880(this$, row, column) {
+    return this$.table.TryGetCellAt(row, column);
+}
+
+export function DataMap__GetExplicationColumn(this$) {
+    return this$.table.GetColumnByHeader(DataMapAux_explicationHeader);
+}
+
+export function DataMap__AddExplicationColumn_C98E589(this$, cells) {
+    this$.table.AddColumn(DataMapAux_explicationHeader, cells);
+}
+
+export function DataMap__GetUnitColumn(this$) {
+    return this$.table.GetColumnByHeader(DataMapAux_unitHeader);
+}
+
+export function DataMap__AddUnitColumn_C98E589(this$, cells) {
+    this$.table.AddColumn(DataMapAux_unitHeader, cells);
+}
+
+export function DataMap__GetDataTypeColumn(this$) {
+    return this$.table.GetColumnByHeader(DataMapAux_objectTypeHeader);
+}
+
+export function DataMap__AddDataTypeColumn_C98E589(this$, cells) {
+    this$.table.AddColumn(DataMapAux_objectTypeHeader, cells);
+}
+
+export function DataMap__GetDescriptionColumn(this$) {
+    return this$.table.GetColumnByHeader(DataMapAux_descriptionHeader);
+}
+
+export function DataMap__AddDescriptionColumn_C98E589(this$, cells) {
+    this$.table.AddColumn(DataMapAux_descriptionHeader, cells);
+}
+
+export function DataMap__GetRow_ABCEF95(this$, row, SkipValidation) {
+    return this$.table.GetRow(row, unwrap(SkipValidation));
+}
+
+export function DataMap_getRow_ABCEF95(row, SkipValidation) {
+    return (dm) => DataMap__GetRow_ABCEF95(dm, row, unwrap(SkipValidation));
+}
+
+export function DataMap__Copy(this$) {
+    return DataMap_$ctor_ZD0829CB(Array.from(DataMap__get_Headers(this$)), new Dictionary(DataMap__get_Values(this$), {
+        Equals: equalArrays,
+        GetHashCode: arrayHash,
+    }));
+}
+

package/FileSystem/DefaultGitattributes.js

@@ -0,0 +1,3 @@
+
+export const dga = "**/dataset/**";
+

package/FileSystem/FileSystemTree.js

@@ -224,19 +224,33 @@ export class FileSystemTree extends Union {
     static createEmptyFolder(name) {
         return FileSystemTree.createFolder(name, [FileSystemTree.createGitKeepFile()]);
     }
-    static createAssayFolder(assayName) {
+    static createAssayFolder(assayName, hasDataMap) {
+        const hasDataMap_1 = defaultArg(hasDataMap, false);
         const dataset = FileSystemTree.createEmptyFolder("dataset");
         const protocols = FileSystemTree.createEmptyFolder("protocols");
         const readme = FileSystemTree.createReadmeFile();
         const assayFile = FileSystemTree.createFile("isa.assay.xlsx");
-        return FileSystemTree.createFolder(assayName, [dataset, protocols, assayFile, readme]);
+        if (hasDataMap_1) {
+            const dataMapFile = FileSystemTree.createFile("isa.datamap.xlsx");
+            return FileSystemTree.createFolder(assayName, [dataset, protocols, assayFile, readme, dataMapFile]);
+        }
+        else {
+            return FileSystemTree.createFolder(assayName, [dataset, protocols, assayFile, readme]);
+        }
     }
-    static createStudyFolder(studyName) {
+    static createStudyFolder(studyName, hasDataMap) {
+        const hasDataMap_1 = defaultArg(hasDataMap, false);
         const resources = FileSystemTree.createEmptyFolder("resources");
         const protocols = FileSystemTree.createEmptyFolder("protocols");
         const readme = FileSystemTree.createReadmeFile();
         const studyFile = FileSystemTree.createFile("isa.study.xlsx");
-        return FileSystemTree.createFolder(studyName, [resources, protocols, studyFile, readme]);
+        if (hasDataMap_1) {
+            const dataMapFile = FileSystemTree.createFile("isa.datamap.xlsx");
+            return FileSystemTree.createFolder(studyName, [resources, protocols, studyFile, readme, dataMapFile]);
+        }
+        else {
+            return FileSystemTree.createFolder(studyName, [resources, protocols, studyFile, readme]);
+        }
     }
     static createInvestigationFile() {
         return FileSystemTree.createFile("isa.investigation.xlsx");

package/Json/Assay.js

@@ -39,7 +39,7 @@ export function Assay_encoder(assay) {
 
 export const Assay_decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, arg_9, objectArg_4, arg_11, objectArg_5, arg_13, objectArg_6;
-    return ArcAssay.create((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_9 = Decode_resizeArray(ArcTable_decoder), (objectArg_4 = get$.Optional, objectArg_4.Field("Tables", arg_9)))), unwrap((arg_11 = Decode_resizeArray(Person_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Performers", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Comment_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Comments", arg_13)))));
+    return ArcAssay.create((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_9 = Decode_resizeArray(ArcTable_decoder), (objectArg_4 = get$.Optional, objectArg_4.Field("Tables", arg_9)))), void 0, unwrap((arg_11 = Decode_resizeArray(Person_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Performers", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Comment_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Comments", arg_13)))));
 });
 
 export function Assay_encoderCompressed(stringTable, oaTable, cellTable, assay) {
@@ -57,7 +57,7 @@ export function Assay_encoderCompressed(stringTable, oaTable, cellTable, assay)
 export function Assay_decoderCompressed(stringTable, oaTable, cellTable) {
     return object((get$) => {
         let objectArg, objectArg_1, objectArg_2, objectArg_3, arg_9, objectArg_4, arg_11, objectArg_5, arg_13, objectArg_6;
-        return ArcAssay.create((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_9 = Decode_resizeArray(ArcTable_decoderCompressed(stringTable, oaTable, cellTable)), (objectArg_4 = get$.Optional, objectArg_4.Field("Tables", arg_9)))), unwrap((arg_11 = Decode_resizeArray(Person_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Performers", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Comment_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Comments", arg_13)))));
+        return ArcAssay.create((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_9 = Decode_resizeArray(ArcTable_decoderCompressed(stringTable, oaTable, cellTable)), (objectArg_4 = get$.Optional, objectArg_4.Field("Tables", arg_9)))), void 0, unwrap((arg_11 = Decode_resizeArray(Person_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Performers", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Comment_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Comments", arg_13)))));
     });
 }
 
@@ -94,7 +94,7 @@ export const Assay_ROCrate_decoder = object((get$) => {
         const a = ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(arg_4);
         return a.Tables;
     }, (arg_3 = list_2(Process_ROCrate_decoder), (objectArg_1 = get$.Optional, objectArg_1.Field("processSequence", arg_3))));
-    return new ArcAssay(identifier, unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("measurementType", OntologyAnnotation_ROCrate_decoderPropertyValue))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("technologyType", OntologyAnnotation_ROCrate_decoderDefinedTerm))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("technologyPlatform", OntologyAnnotation_ROCrate_decoderDefinedTerm))), unwrap(tables), unwrap((arg_12 = Decode_resizeArray(Person_ROCrate_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("performers", arg_12)))), unwrap((arg_14 = Decode_resizeArray(Comment_ROCrate_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("comments", arg_14)))));
+    return new ArcAssay(identifier, unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("measurementType", OntologyAnnotation_ROCrate_decoderPropertyValue))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("technologyType", OntologyAnnotation_ROCrate_decoderDefinedTerm))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("technologyPlatform", OntologyAnnotation_ROCrate_decoderDefinedTerm))), unwrap(tables), void 0, unwrap((arg_12 = Decode_resizeArray(Person_ROCrate_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("performers", arg_12)))), unwrap((arg_14 = Decode_resizeArray(Comment_ROCrate_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("comments", arg_14)))));
 });
 
 export function Assay_ISAJson_encoder(a) {
@@ -123,7 +123,7 @@ export const Assay_ISAJson_decoder = Decode_objectNoAdditionalProperties(Assay_I
         const a = ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(arg_4);
         return a.Tables;
     }, (arg_3 = list_2(Process_ISAJson_decoder), (objectArg_1 = get$.Optional, objectArg_1.Field("processSequence", arg_3))));
-    return new ArcAssay(identifier, unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("measurementType", OntologyAnnotation_ISAJson_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("technologyType", OntologyAnnotation_ISAJson_decoder))), unwrap((arg_10 = map_1(JsonTypes_decomposeTechnologyPlatform, string), (objectArg_4 = get$.Optional, objectArg_4.Field("technologyPlatform", arg_10)))), unwrap(tables), void 0, unwrap((arg_12 = Decode_resizeArray(Comment_ISAJson_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("comments", arg_12)))));
+    return new ArcAssay(identifier, unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("measurementType", OntologyAnnotation_ISAJson_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("technologyType", OntologyAnnotation_ISAJson_decoder))), unwrap((arg_10 = map_1(JsonTypes_decomposeTechnologyPlatform, string), (objectArg_4 = get$.Optional, objectArg_4.Field("technologyPlatform", arg_10)))), unwrap(tables), void 0, void 0, unwrap((arg_12 = Decode_resizeArray(Comment_ISAJson_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("comments", arg_12)))));
 });
 
 export function ARCtrl_ArcAssay__ArcAssay_fromJsonString_Static_Z721C83C5(s) {

package/Json/Process/Data.js

@@ -1,19 +1,57 @@
-import { printf, toText, replace } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { URIModule_toString } from "../../Core/URI.js";
-import { ofArray, singleton, choose } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { singleton, ofArray, choose } from "../../fable_modules/fable-library-js.4.16.0/List.js";
 import { equals } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
 import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
+import { defaultSpaces, tryIncludeSeq, tryInclude } from "../Encode.js";
+import { DataFile_ROCrate_decoder, DataFile_ROCrate_encoder, DataFile_ISAJson_decoder, DataFile_ISAJson_encoder } from "./DataFile.js";
+import { Comment_ISAJson_decoder, Comment_ISAJson_encoder, Comment_ROCrate_decoder, Comment_ROCrate_encoder, Comment_decoder, Comment_encoder } from "../Comment.js";
+import { string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { Data } from "../../Core/Data.js";
+import { unwrap } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { Decode_objectNoAdditionalProperties, Decode_resizeArray, Decode_uri } from "../Decode.js";
+import { decodeString, encodeString } from "../StringTable.js";
+import { printf, toText, replace } from "../../fable_modules/fable-library-js.4.16.0/String.js";
+import { URIModule_toString } from "../../Core/URI.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 { DataFile_ISAJson_decoder, DataFile_ISAJson_encoder, DataFile_ROCrate_decoder, DataFile_ROCrate_encoder } from "./DataFile.js";
-import { Comment_ISAJson_decoder, Comment_ISAJson_encoder, Comment_ROCrate_decoder, Comment_ROCrate_encoder } from "../Comment.js";
 import { context_jsonvalue } from "../context/rocrate/isa_data_context.js";
-import { list as list_2, string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
-import { Decode_objectNoAdditionalProperties, Decode_uri } from "../Decode.js";
-import { Data } from "../../Core/Process/Data.js";
 import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
 import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
 
+export function Data_encoder(d) {
+    return new Json(5, [choose((tupledArg) => {
+        const v = tupledArg[1];
+        if (equals(v, new Json(3, []))) {
+            return void 0;
+        }
+        else {
+            return [tupledArg[0], v];
+        }
+    }, ofArray([tryInclude("@id", (value) => (new Json(0, [value])), d.ID), tryInclude("name", (value_2) => (new Json(0, [value_2])), d.Name), tryInclude("dataType", DataFile_ISAJson_encoder, d.DataType), tryInclude("format", (value_4) => (new Json(0, [value_4])), d.Format), tryInclude("selectorFormat", (value_6) => (new Json(0, [value_6])), d.SelectorFormat), tryIncludeSeq("comments", Comment_encoder, d.Comments)]))]);
+}
+
+export const Data_decoder = object((get$) => {
+    let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5;
+    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("dataType", DataFile_ISAJson_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("format", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("selectorFormat", Decode_uri))), unwrap((arg_11 = Decode_resizeArray(Comment_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("comments", arg_11)))));
+});
+
+export function Data_compressedEncoder(stringTable, d) {
+    return new Json(5, [choose((tupledArg) => {
+        const v = tupledArg[1];
+        if (equals(v, new Json(3, []))) {
+            return void 0;
+        }
+        else {
+            return [tupledArg[0], v];
+        }
+    }, ofArray([tryInclude("i", (s) => encodeString(stringTable, s), d.ID), tryInclude("n", (s_1) => encodeString(stringTable, s_1), d.Name), tryInclude("d", DataFile_ISAJson_encoder, d.DataType), tryInclude("f", (s_2) => encodeString(stringTable, s_2), d.Format), tryInclude("s", (s_3) => encodeString(stringTable, s_3), d.SelectorFormat), tryIncludeSeq("c", Comment_encoder, d.Comments)]))]);
+}
+
+export function Data_compressedDecoder(stringTable) {
+    return object((get$) => {
+        let arg_1, objectArg, arg_3, objectArg_1, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4, arg_11, objectArg_5;
+        return new Data(unwrap((arg_1 = decodeString(stringTable), (objectArg = get$.Optional, objectArg.Field("i", arg_1)))), unwrap((arg_3 = decodeString(stringTable), (objectArg_1 = get$.Optional, objectArg_1.Field("n", arg_3)))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("d", DataFile_ISAJson_decoder))), unwrap((arg_7 = decodeString(stringTable), (objectArg_3 = get$.Optional, objectArg_3.Field("f", arg_7)))), unwrap((arg_9 = decodeString(stringTable), (objectArg_4 = get$.Optional, objectArg_4.Field("s", arg_9)))), unwrap((arg_11 = Decode_resizeArray(Comment_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("c", arg_11)))));
+    });
+}
+
 export function Data_ROCrate_genID(d) {
     const matchValue = d.ID;
     if (matchValue == null) {
@@ -39,12 +77,12 @@ export function Data_ROCrate_encoder(oa) {
         else {
             return [tupledArg[0], v];
         }
-    }, ofArray([["@id", new Json(0, [Data_ROCrate_genID(oa)])], ["@type", list_1(singleton(new Json(0, ["Data"])))], tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", DataFile_ROCrate_encoder, oa.DataType), tryIncludeListOpt("comments", Comment_ROCrate_encoder, oa.Comments), ["@context", context_jsonvalue]]))]);
+    }, ofArray([["@id", new Json(0, [Data_ROCrate_genID(oa)])], ["@type", list_1(singleton(new Json(0, ["Data"])))], tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", DataFile_ROCrate_encoder, oa.DataType), tryInclude("encodingFormat", (value_5) => (new Json(0, [value_5])), oa.Format), tryInclude("usageInfo", (value_7) => (new Json(0, [value_7])), oa.SelectorFormat), tryIncludeSeq("comments", Comment_ROCrate_encoder, oa.Comments), ["@context", context_jsonvalue]]))]);
 }
 
 export const Data_ROCrate_decoder = object((get$) => {
-    let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3;
-    return new Data((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", DataFile_ROCrate_decoder)), (arg_7 = list_2(Comment_ROCrate_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7))));
+    let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5;
+    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("type", DataFile_ROCrate_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("encodingFormat", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("usageInfo", Decode_uri))), unwrap((arg_11 = Decode_resizeArray(Comment_ROCrate_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("comments", arg_11)))));
 });
 
 export function Data_ISAJson_encoder(oa) {
@@ -56,17 +94,17 @@ export function Data_ISAJson_encoder(oa) {
         else {
             return [tupledArg[0], v];
         }
-    }, ofArray([tryInclude("@id", (value) => (new Json(0, [value])), oa.ID), tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", DataFile_ISAJson_encoder, oa.DataType), tryIncludeListOpt("comments", Comment_ISAJson_encoder, oa.Comments)]))]);
+    }, ofArray([tryInclude("@id", (value) => (new Json(0, [value])), oa.ID), tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", DataFile_ISAJson_encoder, oa.DataType), tryIncludeSeq("comments", Comment_ISAJson_encoder, oa.Comments)]))]);
 }
 
 export const Data_ISAJson_allowedFields = ofArray(["@id", "name", "type", "comments", "@type", "@context"]);
 
 export const Data_ISAJson_decoder = Decode_objectNoAdditionalProperties(Data_ISAJson_allowedFields, (get$) => {
     let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3;
-    return new Data((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", DataFile_ISAJson_decoder)), (arg_7 = list_2(Comment_ISAJson_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7))));
+    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("type", DataFile_ISAJson_decoder))), void 0, void 0, unwrap((arg_7 = Decode_resizeArray(Comment_ISAJson_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7)))));
 });
 
-export function ARCtrl_Process_Data__Data_fromISAJsonString_Static_Z721C83C5(s) {
+export function ARCtrl_Data__Data_fromISAJsonString_Static_Z721C83C5(s) {
     const matchValue = fromString(Data_ISAJson_decoder, s);
     if (matchValue.tag === 1) {
         throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
@@ -76,14 +114,14 @@ export function ARCtrl_Process_Data__Data_fromISAJsonString_Static_Z721C83C5(s)
     }
 }
 
-export function ARCtrl_Process_Data__Data_toISAJsonString_Static_71136F3F(spaces) {
+export function ARCtrl_Data__Data_toISAJsonString_Static_71136F3F(spaces) {
     return (f) => {
         const value = Data_ISAJson_encoder(f);
         return toString(defaultSpaces(spaces), value);
     };
 }
 
-export function ARCtrl_Process_Data__Data_fromROCrateJsonString_Static_Z721C83C5(s) {
+export function ARCtrl_Data__Data_fromROCrateJsonString_Static_Z721C83C5(s) {
     const matchValue = fromString(Data_ROCrate_decoder, s);
     if (matchValue.tag === 1) {
         throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
@@ -93,7 +131,7 @@ export function ARCtrl_Process_Data__Data_fromROCrateJsonString_Static_Z721C83C5
     }
 }
 
-export function ARCtrl_Process_Data__Data_toROCrateJsonString_Static_71136F3F(spaces) {
+export function ARCtrl_Data__Data_toROCrateJsonString_Static_71136F3F(spaces) {
     return (f) => {
         const value = Data_ROCrate_encoder(f);
         return toString(defaultSpaces(spaces), value);

package/Json/Process/DataFile.js

@@ -1,7 +1,7 @@
 import { ErrorReason$1, Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
 import { string } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { FSharpResult$2 } from "../../fable_modules/fable-library-js.4.16.0/Result.js";
-import { DataFile } from "../../Core/Process/DataFile.js";
+import { DataFile } from "../../Core/DataFile.js";
 import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
 import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
@@ -45,7 +45,7 @@ export const DataFile_ISAJson_encoder = DataFile_ROCrate_encoder;
 
 export const DataFile_ISAJson_decoder = DataFile_ROCrate_decoder;
 
-export function ARCtrl_Process_DataFile__DataFile_fromISAJsonString_Static_Z721C83C5(s) {
+export function ARCtrl_DataFile__DataFile_fromISAJsonString_Static_Z721C83C5(s) {
     const matchValue = fromString(DataFile_ISAJson_decoder, s);
     if (matchValue.tag === 1) {
         throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
@@ -55,14 +55,14 @@ export function ARCtrl_Process_DataFile__DataFile_fromISAJsonString_Static_Z721C
     }
 }
 
-export function ARCtrl_Process_DataFile__DataFile_toISAJsonString_Static_71136F3F(spaces) {
+export function ARCtrl_DataFile__DataFile_toISAJsonString_Static_71136F3F(spaces) {
     return (f) => {
         const value = DataFile_ISAJson_encoder(f);
         return toString(defaultSpaces(spaces), value);
     };
 }
 
-export function ARCtrl_Process_DataFile__DataFile_fromROCrateJsonString_Static_Z721C83C5(s) {
+export function ARCtrl_DataFile__DataFile_fromROCrateJsonString_Static_Z721C83C5(s) {
     const matchValue = fromString(DataFile_ROCrate_decoder, s);
     if (matchValue.tag === 1) {
         throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
@@ -72,7 +72,7 @@ export function ARCtrl_Process_DataFile__DataFile_fromROCrateJsonString_Static_Z
     }
 }
 
-export function ARCtrl_Process_DataFile__DataFile_toROCrateJsonString_Static_71136F3F(spaces) {
+export function ARCtrl_DataFile__DataFile_toROCrateJsonString_Static_71136F3F(spaces) {
     return (f) => {
         const value = DataFile_ROCrate_encoder(f);
         return toString(defaultSpaces(spaces), value);

package/Json/Process/PropertyValue.js

@@ -12,10 +12,11 @@ import { Value } from "../../Core/Process/Value.js";
 export function genID(p) {
     const matchValue = p.GetCategory();
     if (matchValue == null) {
-        return `#Empty${() => p.GetAdditionalType()}`;
+        return `#Empty${p.GetAdditionalType()}`;
     }
     else {
-        return `${() => p.GetAdditionalType()}/${matchValue}${p.GetValue()}${p.GetUnit()}`;
+        const t = matchValue;
+        return `${p.GetAdditionalType()}/${t}${p.GetValue()}${p.GetUnit()}`;
     }
 }
 
@@ -76,8 +77,127 @@ export function encoder(pv) {
 
 export function decoder(create) {
     return object((get$) => {
-        let name, objectArg, code, objectArg_1, code_1, value, objectArg_2, code_2, objectArg_3, name_1, objectArg_4, code_3, objectArg_5, code_4;
-        return create((name = ((objectArg = get$.Optional, objectArg.Field("category", string))), (code = ((objectArg_1 = get$.Optional, objectArg_1.Field("categoryCode", string))), (name == null) ? ((code != null) ? ((code_1 = code, OntologyAnnotation.fromTermAnnotation(code_1, unwrap(name)))) : void 0) : ((code != null) ? ((code_1 = code, OntologyAnnotation.fromTermAnnotation(code_1, unwrap(name)))) : OntologyAnnotation.create(name)))), (value = ((objectArg_2 = get$.Optional, objectArg_2.Field("value", AnnotationValue_decoder))), (code_2 = ((objectArg_3 = get$.Optional, objectArg_3.Field("valueCode", string))), ((value == null) && (code_2 == null)) ? void 0 : Value.fromOptions(value, void 0, code_2))), (name_1 = ((objectArg_4 = get$.Optional, objectArg_4.Field("unit", string))), (code_3 = ((objectArg_5 = get$.Optional, objectArg_5.Field("unitCode", string))), (name_1 == null) ? ((code_3 != null) ? ((code_4 = code_3, OntologyAnnotation.fromTermAnnotation(code_4, unwrap(name_1)))) : void 0) : ((code_3 != null) ? ((code_4 = code_3, OntologyAnnotation.fromTermAnnotation(code_4, unwrap(name_1)))) : OntologyAnnotation.create(name_1)))));
+        let value, objectArg_4, code_4, objectArg_5;
+        let category;
+        let name;
+        const objectArg = get$.Optional;
+        name = objectArg.Field("category", string);
+        let code;
+        const objectArg_1 = get$.Optional;
+        code = objectArg_1.Field("categoryCode", string);
+        let matchResult, code_1;
+        if (name == null) {
+            if (code != null) {
+                if (code === "") {
+                    matchResult = 0;
+                }
+                else {
+                    matchResult = 2;
+                    code_1 = code;
+                }
+            }
+            else {
+                matchResult = 0;
+            }
+        }
+        else if (code != null) {
+            if (code === "") {
+                matchResult = 1;
+            }
+            else {
+                matchResult = 2;
+                code_1 = code;
+            }
+        }
+        else {
+            matchResult = 1;
+        }
+        switch (matchResult) {
+            case 0: {
+                category = void 0;
+                break;
+            }
+            case 1: {
+                try {
+                    category = OntologyAnnotation.create(name);
+                }
+                catch (err) {
+                    throw new Error(`Error while decoding category (name:${name}): ${err}`);
+                }
+                break;
+            }
+            default:
+                try {
+                    category = OntologyAnnotation.fromTermAnnotation(code_1, unwrap(name));
+                }
+                catch (err_1) {
+                    throw new Error(`Error while decoding category (name:${name}, code:${code_1}): ${err_1}`);
+                }
+        }
+        let unit;
+        let name_1;
+        const objectArg_2 = get$.Optional;
+        name_1 = objectArg_2.Field("unit", string);
+        let code_2;
+        const objectArg_3 = get$.Optional;
+        code_2 = objectArg_3.Field("unitCode", string);
+        let matchResult_1, code_3;
+        if (name_1 == null) {
+            if (code_2 != null) {
+                if (code_2 === "") {
+                    matchResult_1 = 0;
+                }
+                else {
+                    matchResult_1 = 2;
+                    code_3 = code_2;
+                }
+            }
+            else {
+                matchResult_1 = 0;
+            }
+        }
+        else if (code_2 != null) {
+            if (code_2 === "") {
+                matchResult_1 = 1;
+            }
+            else {
+                matchResult_1 = 2;
+                code_3 = code_2;
+            }
+        }
+        else {
+            matchResult_1 = 1;
+        }
+        switch (matchResult_1) {
+            case 0: {
+                unit = void 0;
+                break;
+            }
+            case 1: {
+                try {
+                    unit = OntologyAnnotation.create(name_1);
+                }
+                catch (err_2) {
+                    throw new Error(`Error while decoding unit (name:${name_1}): ${err_2}`);
+                }
+                break;
+            }
+            default:
+                try {
+                    unit = OntologyAnnotation.fromTermAnnotation(code_3, unwrap(name_1));
+                }
+                catch (err_3) {
+                    throw new Error(`Error while decoding unit (name:${name_1}, code:${code_3}): ${err_3}`);
+                }
+        }
+        return create(category, (value = ((objectArg_4 = get$.Optional, objectArg_4.Field("value", AnnotationValue_decoder))), (code_4 = ((objectArg_5 = get$.Optional, objectArg_5.Field("valueCode", string))), ((value == null) && (code_4 == null)) ? void 0 : (() => {
+            try {
+                return Value.fromOptions(value, void 0, code_4);
+            }
+            catch (err_4) {
+                throw new Error(`Error while decoding value ${value},${code_4}: ${err_4}`);
+            }
+        })())), unit);
     });
 }
 

package/Json/Study.js

@@ -55,7 +55,7 @@ export function Study_encoder(study) {
 
 export const Study_decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10;
-    return new ArcStudy((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("SubmissionDate", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("PublicReleaseDate", string))), unwrap((arg_11 = Decode_resizeArray(Publication_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Person_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13)))), unwrap((arg_15 = Decode_resizeArray(OntologyAnnotation_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15)))), unwrap((arg_17 = Decode_resizeArray(ArcTable_decoder), (objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17)))), unwrap((arg_19 = Decode_resizeArray(string), (objectArg_9 = get$.Optional, objectArg_9.Field("RegisteredAssayIdentifiers", arg_19)))), unwrap((arg_21 = Decode_resizeArray(Comment_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21)))));
+    return new ArcStudy((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("SubmissionDate", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("PublicReleaseDate", string))), unwrap((arg_11 = Decode_resizeArray(Publication_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Person_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13)))), unwrap((arg_15 = Decode_resizeArray(OntologyAnnotation_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15)))), unwrap((arg_17 = Decode_resizeArray(ArcTable_decoder), (objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17)))), void 0, unwrap((arg_19 = Decode_resizeArray(string), (objectArg_9 = get$.Optional, objectArg_9.Field("RegisteredAssayIdentifiers", arg_19)))), unwrap((arg_21 = Decode_resizeArray(Comment_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21)))));
 });
 
 export function Study_encoderCompressed(stringTable, oaTable, cellTable, study) {
@@ -73,7 +73,7 @@ export function Study_encoderCompressed(stringTable, oaTable, cellTable, study)
 export function Study_decoderCompressed(stringTable, oaTable, cellTable) {
     return object((get$) => {
         let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10;
-        return new ArcStudy((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("SubmissionDate", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("PublicReleaseDate", string))), unwrap((arg_11 = Decode_resizeArray(Publication_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Person_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13)))), unwrap((arg_15 = Decode_resizeArray(OntologyAnnotation_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15)))), unwrap((arg_17 = Decode_resizeArray(ArcTable_decoderCompressed(stringTable, oaTable, cellTable)), (objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17)))), unwrap((arg_19 = Decode_resizeArray(string), (objectArg_9 = get$.Optional, objectArg_9.Field("RegisteredAssayIdentifiers", arg_19)))), unwrap((arg_21 = Decode_resizeArray(Comment_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21)))));
+        return new ArcStudy((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("SubmissionDate", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("PublicReleaseDate", string))), unwrap((arg_11 = Decode_resizeArray(Publication_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Person_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13)))), unwrap((arg_15 = Decode_resizeArray(OntologyAnnotation_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15)))), unwrap((arg_17 = Decode_resizeArray(ArcTable_decoderCompressed(stringTable, oaTable, cellTable)), (objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17)))), void 0, unwrap((arg_19 = Decode_resizeArray(string), (objectArg_9 = get$.Optional, objectArg_9.Field("RegisteredAssayIdentifiers", arg_19)))), unwrap((arg_21 = Decode_resizeArray(Comment_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21)))));
     });
 }
 
@@ -115,7 +115,7 @@ export const Study_ROCrate_decoder = object((get$) => {
         return Array.from(collection);
     }, assays);
     const tables = map((ps) => ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(ps).Tables, (arg_6 = list_2(Process_ROCrate_decoder), (objectArg_2 = get$.Optional, objectArg_2.Field("processSequence", arg_6))));
-    return [new ArcStudy(identifier, unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("title", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("description", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("submissionDate", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("publicReleaseDate", string))), unwrap((arg_16 = Decode_resizeArray(Publication_ROCrate_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("publications", arg_16)))), unwrap((arg_18 = Decode_resizeArray(Person_ROCrate_decoder), (objectArg_8 = get$.Optional, objectArg_8.Field("people", arg_18)))), unwrap((arg_20 = Decode_resizeArray(OntologyAnnotation_ROCrate_decoderDefinedTerm), (objectArg_9 = get$.Optional, objectArg_9.Field("studyDesignDescriptors", arg_20)))), unwrap(tables), unwrap(assayIdentifiers), unwrap((arg_22 = Decode_resizeArray(Comment_ROCrate_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("comments", arg_22))))), defaultArg(assays, empty())];
+    return [new ArcStudy(identifier, unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("title", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("description", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("submissionDate", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("publicReleaseDate", string))), unwrap((arg_16 = Decode_resizeArray(Publication_ROCrate_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("publications", arg_16)))), unwrap((arg_18 = Decode_resizeArray(Person_ROCrate_decoder), (objectArg_8 = get$.Optional, objectArg_8.Field("people", arg_18)))), unwrap((arg_20 = Decode_resizeArray(OntologyAnnotation_ROCrate_decoderDefinedTerm), (objectArg_9 = get$.Optional, objectArg_9.Field("studyDesignDescriptors", arg_20)))), unwrap(tables), void 0, unwrap(assayIdentifiers), unwrap((arg_22 = Decode_resizeArray(Comment_ROCrate_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("comments", arg_22))))), defaultArg(assays, empty())];
 });
 
 /**
@@ -227,7 +227,7 @@ export const Study_ISAJson_decoder = Decode_objectNoAdditionalProperties(Study_I
         const collection = map_1((a_1) => a_1.Identifier, arg_11);
         return Array.from(collection);
     }, assays);
-    return [new ArcStudy(identifier, unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("title", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("description", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("submissionDate", string))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("publicReleaseDate", string))), unwrap((arg_21 = Decode_resizeArray(Publication_ISAJson_decoder), (objectArg_9 = get$.Optional, objectArg_9.Field("publications", arg_21)))), unwrap((persons.length === 0) ? void 0 : persons), unwrap((arg_23 = Decode_resizeArray(OntologyAnnotation_ISAJson_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("studyDesignDescriptors", arg_23)))), unwrap(tables), unwrap(assayIdentifiers), unwrap((arg_25 = Decode_resizeArray(Comment_ISAJson_decoder), (objectArg_11 = get$.Optional, objectArg_11.Field("comments", arg_25))))), defaultArg(assays, empty())];
+    return [new ArcStudy(identifier, unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("title", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("description", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("submissionDate", string))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("publicReleaseDate", string))), unwrap((arg_21 = Decode_resizeArray(Publication_ISAJson_decoder), (objectArg_9 = get$.Optional, objectArg_9.Field("publications", arg_21)))), unwrap((persons.length === 0) ? void 0 : persons), unwrap((arg_23 = Decode_resizeArray(OntologyAnnotation_ISAJson_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("studyDesignDescriptors", arg_23)))), unwrap(tables), void 0, unwrap(assayIdentifiers), unwrap((arg_25 = Decode_resizeArray(Comment_ISAJson_decoder), (objectArg_11 = get$.Optional, objectArg_11.Field("comments", arg_25))))), defaultArg(assays, empty())];
 });
 
 export function ARCtrl_ArcStudy__ArcStudy_fromJsonString_Static_Z721C83C5(s) {