@nfdi4plants/arctrl 2.0.0-beta.1 → 2.0.0-beta.8

package/Json/Study.js

@@ -9,6 +9,7 @@ import { Publication_ISAJson_decoder, Publication_ISAJson_encoder, Publication_R
 import { Person_ISAJson_decoder, Person_ISAJson_encoder, Person_ROCrate_decoder, Person_ROCrate_encoder, Person_decoder, Person_encoder } from "./Person.js";
 import { OntologyAnnotation_ISAJson_decoder, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ROCrate_decoderDefinedTerm, OntologyAnnotation_ROCrate_encoderDefinedTerm, OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "./OntologyAnnotation.js";
 import { ArcTable_decoderCompressed, ArcTable_encoderCompressed, ArcTable_decoder, ArcTable_encoder } from "./Table/ArcTable.js";
+import { decoderCompressed, encoderCompressed, decoder as decoder_1, encoder as encoder_4 } from "./DataMap/DataMap.js";
 import { Comment_ISAJson_decoder, Comment_ISAJson_encoder, Comment_ROCrate_decoder, Comment_ROCrate_encoder, Comment_decoder, Comment_encoder } from "./Comment.js";
 import { list as list_2, string, object } from "../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { Decode_objectNoAdditionalProperties, Decode_resizeArray } from "./Decode.js";
@@ -22,7 +23,7 @@ import { context_jsonvalue } from "./context/rocrate/isa_study_context.js";
 import { getProtocols, getCharacteristics, getFactors, getUnits } from "../Core/Process/ProcessSequence.js";
 import { Factor_ISAJson_encoder } from "./Process/Factor.js";
 import { MaterialAttribute_ISAJson_encoder } from "./Process/MaterialAttribute.js";
-import { encoder as encoder_4 } from "./Process/StudyMaterials.js";
+import { encoder as encoder_5 } from "./Process/StudyMaterials.js";
 import { Protocol_ISAJson_encoder } from "./Process/Protocol.js";
 import { encode } from "./IDTable.js";
 import { isEmpty } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
@@ -51,12 +52,12 @@ export function Study_encoder(study) {
         else {
             return [tupledArg[0], v];
         }
-    }, ofArray([["Identifier", new Json(0, [study.Identifier])], tryInclude("Title", (value_1) => (new Json(0, [value_1])), study.Title), tryInclude("Description", (value_3) => (new Json(0, [value_3])), study.Description), tryInclude("SubmissionDate", (value_5) => (new Json(0, [value_5])), study.SubmissionDate), tryInclude("PublicReleaseDate", (value_7) => (new Json(0, [value_7])), study.PublicReleaseDate), tryIncludeSeq("Publications", Publication_encoder, study.Publications), tryIncludeSeq("Contacts", Person_encoder, study.Contacts), tryIncludeSeq("StudyDesignDescriptors", OntologyAnnotation_encoder, study.StudyDesignDescriptors), tryIncludeSeq("Tables", ArcTable_encoder, study.Tables), tryIncludeSeq("RegisteredAssayIdentifiers", (value_9) => (new Json(0, [value_9])), study.RegisteredAssayIdentifiers), tryIncludeSeq("Comments", Comment_encoder, study.Comments)]))]);
+    }, ofArray([["Identifier", new Json(0, [study.Identifier])], tryInclude("Title", (value_1) => (new Json(0, [value_1])), study.Title), tryInclude("Description", (value_3) => (new Json(0, [value_3])), study.Description), tryInclude("SubmissionDate", (value_5) => (new Json(0, [value_5])), study.SubmissionDate), tryInclude("PublicReleaseDate", (value_7) => (new Json(0, [value_7])), study.PublicReleaseDate), tryIncludeSeq("Publications", Publication_encoder, study.Publications), tryIncludeSeq("Contacts", Person_encoder, study.Contacts), tryIncludeSeq("StudyDesignDescriptors", OntologyAnnotation_encoder, study.StudyDesignDescriptors), tryIncludeSeq("Tables", ArcTable_encoder, study.Tables), tryInclude("DataMap", encoder_4, study.DataMap), tryIncludeSeq("RegisteredAssayIdentifiers", (value_9) => (new Json(0, [value_9])), study.RegisteredAssayIdentifiers), tryIncludeSeq("Comments", Comment_encoder, study.Comments)]))]);
 }
 
 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)))), 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)))));
+    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, objectArg_9, arg_21, objectArg_10, arg_23, objectArg_11;
+    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((objectArg_9 = get$.Optional, objectArg_9.Field("DataMap", decoder_1))), unwrap((arg_21 = Decode_resizeArray(string), (objectArg_10 = get$.Optional, objectArg_10.Field("RegisteredAssayIdentifiers", arg_21)))), unwrap((arg_23 = Decode_resizeArray(Comment_decoder), (objectArg_11 = get$.Optional, objectArg_11.Field("Comments", arg_23)))));
 });
 
 export function Study_encoderCompressed(stringTable, oaTable, cellTable, study) {
@@ -68,13 +69,13 @@ export function Study_encoderCompressed(stringTable, oaTable, cellTable, study)
         else {
             return [tupledArg[0], v];
         }
-    }, ofArray([["Identifier", new Json(0, [study.Identifier])], tryInclude("Title", (value_1) => (new Json(0, [value_1])), study.Title), tryInclude("Description", (value_3) => (new Json(0, [value_3])), study.Description), tryInclude("SubmissionDate", (value_5) => (new Json(0, [value_5])), study.SubmissionDate), tryInclude("PublicReleaseDate", (value_7) => (new Json(0, [value_7])), study.PublicReleaseDate), tryIncludeSeq("Publications", Publication_encoder, study.Publications), tryIncludeSeq("Contacts", Person_encoder, study.Contacts), tryIncludeSeq("StudyDesignDescriptors", OntologyAnnotation_encoder, study.StudyDesignDescriptors), tryIncludeSeq("Tables", (table) => ArcTable_encoderCompressed(stringTable, oaTable, cellTable, table), study.Tables), tryIncludeSeq("RegisteredAssayIdentifiers", (value_9) => (new Json(0, [value_9])), study.RegisteredAssayIdentifiers), tryIncludeSeq("Comments", Comment_encoder, study.Comments)]))]);
+    }, ofArray([["Identifier", new Json(0, [study.Identifier])], tryInclude("Title", (value_1) => (new Json(0, [value_1])), study.Title), tryInclude("Description", (value_3) => (new Json(0, [value_3])), study.Description), tryInclude("SubmissionDate", (value_5) => (new Json(0, [value_5])), study.SubmissionDate), tryInclude("PublicReleaseDate", (value_7) => (new Json(0, [value_7])), study.PublicReleaseDate), tryIncludeSeq("Publications", Publication_encoder, study.Publications), tryIncludeSeq("Contacts", Person_encoder, study.Contacts), tryIncludeSeq("StudyDesignDescriptors", OntologyAnnotation_encoder, study.StudyDesignDescriptors), tryIncludeSeq("Tables", (table) => ArcTable_encoderCompressed(stringTable, oaTable, cellTable, table), study.Tables), tryInclude("DataMap", (dm) => encoderCompressed(stringTable, oaTable, cellTable, dm), study.DataMap), tryIncludeSeq("RegisteredAssayIdentifiers", (value_9) => (new Json(0, [value_9])), study.RegisteredAssayIdentifiers), tryIncludeSeq("Comments", Comment_encoder, study.Comments)]))]);
 }
 
 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)))), 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)))));
+        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, arg_23, objectArg_11;
+        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 = decoderCompressed(stringTable, oaTable, cellTable), (objectArg_9 = get$.Optional, objectArg_9.Field("DataMap", arg_19)))), unwrap((arg_21 = Decode_resizeArray(string), (objectArg_10 = get$.Optional, objectArg_10.Field("RegisteredAssayIdentifiers", arg_21)))), unwrap((arg_23 = Decode_resizeArray(Comment_decoder), (objectArg_11 = get$.Optional, objectArg_11.Field("Comments", arg_23)))));
     });
 }
 
@@ -156,7 +157,7 @@ export function Study_ISAJson_encoder(idMap, assays, s) {
         const encodedUnits = tryIncludeList("unitCategories", (oa) => OntologyAnnotation_ISAJson_encoder(idMap, oa), getUnits(processes));
         const encodedFactors = tryIncludeList("factors", (value_1) => Factor_ISAJson_encoder(idMap, value_1), getFactors(processes));
         const encodedCharacteristics = tryIncludeList("characteristicCategories", (value_3) => MaterialAttribute_ISAJson_encoder(idMap, value_3), getCharacteristics(processes));
-        const encodedMaterials = tryInclude("materials", (ps) => encoder_4(idMap, ps), Option_fromValueWithDefault(empty(), processes));
+        const encodedMaterials = tryInclude("materials", (ps) => encoder_5(idMap, ps), Option_fromValueWithDefault(empty(), processes));
         let encodedProtocols;
         const value_5 = getProtocols(processes);
         encodedProtocols = tryIncludeList("protocols", (studyName = s_1.Identifier, (oa_1) => Protocol_ISAJson_encoder(studyName, void 0, void 0, idMap, oa_1)), value_5);

package/Json/Table/CompositeCell.js

@@ -1,7 +1,7 @@
 import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "../OntologyAnnotation.js";
 import { ofArray, singleton } from "../../fable_modules/fable-library-js.4.16.0/List.js";
 import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
-import { Data_compressedDecoder, Data_compressedEncoder, Data_decoder, Data_encoder } from "../Process/Data.js";
+import { Data_compressedDecoder, Data_compressedEncoder, Data_decoder, Data_encoder } from "../Data.js";
 import { list } from "../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
 import { index, string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { CompositeCell } from "../../Core/Table/CompositeCell.js";

package/Json/context/rocrate/isa_data_context.js

@@ -19,7 +19,7 @@ export function IContext_$reflection() {
     return record_type("ARCtrl.Json.ROCrateContext.Data.IContext", [], IContext, () => [["sdo", string_type], ["arc", string_type], ["Data", string_type], ["ArcData", string_type], ["type", string_type], ["name", string_type], ["comments", string_type]]);
 }
 
-export const context_jsonvalue = new Json(5, [[["sdo", new Json(0, ["http://schema.org/"])], ["Data", new Json(0, ["sdo:MediaObject"])], ["type", new Json(0, ["sdo:disambiguatingDescription"])], ["name", new Json(0, ["sdo:name"])], ["comments", new Json(0, ["sdo:comment"])]]]);
+export const context_jsonvalue = new Json(5, [[["sdo", new Json(0, ["http://schema.org/"])], ["Data", new Json(0, ["sdo:MediaObject"])], ["type", new Json(0, ["sdo:disambiguatingDescription"])], ["encodingFormat", new Json(0, ["sdo:encodingFormat"])], ["usageInfo", new Json(0, ["sdo:usageInfo"])], ["name", new Json(0, ["sdo:name"])], ["comments", new Json(0, ["sdo:comment"])]]]);
 
-export const context_str = "\r\n{\r\n  \"@context\": {\r\n    \"sdo\": \"http://schema.org/\",\r\n    \"arc\": \"http://purl.org/nfdi4plants/ontology/\",\r\n\r\n    \"Data\": \"sdo:MediaObject\",\r\n    \"ArcData\": \"arc:ARC#ARC_00000076\",\r\n\r\n    \"type\": \"arc:ARC#ARC_00000107\",\r\n\r\n    \"name\": \"sdo:name\",\r\n    \"comments\": \"sdo:disambiguatingDescription\"\r\n  }\r\n}\r\n    ";
+export const context_str = "\n{\n  \"@context\": {\n    \"sdo\": \"http://schema.org/\",\n    \"arc\": \"http://purl.org/nfdi4plants/ontology/\",\n\n    \"Data\": \"sdo:MediaObject\",\n    \"ArcData\": \"arc:ARC#ARC_00000076\",\n\n    \"type\": \"arc:ARC#ARC_00000107\",\n\n    \"name\": \"sdo:name\",\n    \"comments\": \"sdo:disambiguatingDescription\"\n  }\n}\n    ";
 

package/Json/context/rocrate/isa_investigation_context.js

@@ -29,5 +29,5 @@ export function IContext_$reflection() {
 
 export const context_jsonvalue = new Json(5, [[["sdo", new Json(0, ["http://schema.org/"])], ["Investigation", new Json(0, ["sdo:Dataset"])], ["identifier", new Json(0, ["sdo:identifier"])], ["title", new Json(0, ["sdo:headline"])], ["additionalType", new Json(0, ["sdo:additionalType"])], ["description", new Json(0, ["sdo:description"])], ["submissionDate", new Json(0, ["sdo:dateCreated"])], ["publicReleaseDate", new Json(0, ["sdo:datePublished"])], ["publications", new Json(0, ["sdo:citation"])], ["people", new Json(0, ["sdo:creator"])], ["studies", new Json(0, ["sdo:hasPart"])], ["ontologySourceReferences", new Json(0, ["sdo:mentions"])], ["comments", new Json(0, ["sdo:comment"])], ["filename", new Json(0, ["sdo:alternateName"])]]]);
 
-export const context_str = "\r\n{\r\n  \"@context\": {\r\n    \"sdo\": \"http://schema.org/\",\r\n    \"arc\": \"http://purl.org/nfdi4plants/ontology/\",\r\n\r\n    \"Investigation\": \"sdo:Dataset\",\r\n\r\n    \"identifier\" : \"sdo:identifier\",\r\n    \"title\": \"sdo:headline\",\r\n    \"description\": \"sdo:description\",\r\n    \"submissionDate\": \"sdo:dateCreated\",\r\n    \"publicReleaseDate\": \"sdo:datePublished\",\r\n    \"publications\": \"sdo:citation\",\r\n    \"people\": \"sdo:creator\",\r\n    \"studies\": \"sdo:hasPart\",\r\n    \"ontologySourceReferences\": \"sdo:mentions\",\r\n    \"comments\": \"sdo:disambiguatingDescription\",\r\n\r\n    \"publications?\": \"sdo:subjectOf?\",\r\n    \"filename\": \"sdo:alternateName\"\r\n  }\r\n}\r\n    ";
+export const context_str = "\n{\n  \"@context\": {\n    \"sdo\": \"http://schema.org/\",\n    \"arc\": \"http://purl.org/nfdi4plants/ontology/\",\n\n    \"Investigation\": \"sdo:Dataset\",\n\n    \"identifier\" : \"sdo:identifier\",\n    \"title\": \"sdo:headline\",\n    \"description\": \"sdo:description\",\n    \"submissionDate\": \"sdo:dateCreated\",\n    \"publicReleaseDate\": \"sdo:datePublished\",\n    \"publications\": \"sdo:citation\",\n    \"people\": \"sdo:creator\",\n    \"studies\": \"sdo:hasPart\",\n    \"ontologySourceReferences\": \"sdo:mentions\",\n    \"comments\": \"sdo:disambiguatingDescription\",\n\n    \"publications?\": \"sdo:SubjectOf?\",\n    \"filename\": \"sdo:alternateName\"\n  }\n}\n    ";
 

package/Json/context/rocrate/property_value_context.js

@@ -1,4 +1,4 @@
 import { Json } from "../../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
 
-export const context_jsonvalue = new Json(5, [[["sdo", new Json(0, ["http://schema.org/"])], ["additionalType", new Json(0, ["sdo:additionalType"])], ["category", new Json(0, ["sdo:name"])], ["categoryCode", new Json(0, ["sdo:propertyID"])], ["value", new Json(0, ["sdo:value"])], ["valueCode", new Json(0, ["sdo:valueReference"])], ["unit", new Json(0, ["sdo:unitText"])], ["unitCode", new Json(0, ["sdo:unitCode"])], ["comments", new Json(0, ["sdo:disambiguatingDescription"])]]]);
+export const context_jsonvalue = new Json(5, [[["sdo", new Json(0, ["http://schema.org/"])], ["additionalType", new Json(0, ["sdo:additionalType"])], ["alternateName", new Json(0, ["sdo:alternateName"])], ["measurementMethod", new Json(0, ["sdo:measurementMethod"])], ["description", new Json(0, ["sdo:description"])], ["category", new Json(0, ["sdo:name"])], ["categoryCode", new Json(0, ["sdo:propertyID"])], ["value", new Json(0, ["sdo:value"])], ["valueCode", new Json(0, ["sdo:valueReference"])], ["unit", new Json(0, ["sdo:unitText"])], ["unitCode", new Json(0, ["sdo:unitCode"])], ["comments", new Json(0, ["sdo:disambiguatingDescription"])]]]);
 

package/Spreadsheet/AnnotationTable/ArcTable.js

@@ -3,13 +3,13 @@ import { item, map as map_1 } from "../../fable_modules/fable-library-js.4.16.0/
 import { singleton as singleton_1, collect, map as map_2, delay, toArray as toArray_1, tryFind } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { toStringCellColumns, fixDeprecatedIOHeader, fromStringCellColumns } from "./CompositeColumn.js";
 import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { Dictionary_tryGet, FsCellsCollection__TryGetCell_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCellsCollection.fs.js";
+import { Dictionary_tryGet, FsCellsCollection__TryGetCell_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCellsCollection.fs.js";
 import { rangeDouble } from "../../fable_modules/fable-library-js.4.16.0/Range.js";
-import { FsAddress_$ctor_Z37302880, FsAddress__get_ColumnNumber, FsAddress__get_RowNumber } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
-import { FsRangeAddress_$ctor_7E77A4A0, FsRangeAddress__get_LastAddress } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
-import { FsRangeBase__Cell_Z3407A44B, FsRangeBase__get_RangeAddress } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeBase.fs.js";
+import { FsAddress_$ctor_Z37302880, FsAddress__get_ColumnNumber, FsAddress__get_RowNumber } from "../../fable_modules/FsSpreadsheet.6.2.0/FsAddress.fs.js";
+import { FsRangeAddress_$ctor_7E77A4A0, FsRangeAddress__get_LastAddress } from "../../fable_modules/FsSpreadsheet.6.2.0/Ranges/FsRangeAddress.fs.js";
+import { FsRangeBase__Cell_Z3407A44B, FsRangeBase__get_RangeAddress } from "../../fable_modules/FsSpreadsheet.6.2.0/Ranges/FsRangeBase.fs.js";
 import { ArcTable } from "../../Core/Table/ArcTable.js";
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
 import { comparePrimitives } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
 import { addToDict } from "../../fable_modules/fable-library-js.4.16.0/MapUtil.js";
 

package/Spreadsheet/AnnotationTable/CompositeColumn.js

@@ -1,4 +1,4 @@
-import { map, setItem, item, skip } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
+import { tryItem, map, setItem, item, skip } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
 import { CompositeHeader, IOType } from "../../Core/Table/CompositeHeader.js";
 import { toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
 import { toStringCells, fromStringCells } from "./CompositeHeader.js";
@@ -6,8 +6,9 @@ import { empty, singleton, append, toList, exists, map as map_1, delay, toArray
 import { rangeDouble } from "../../fable_modules/fable-library-js.4.16.0/Range.js";
 import { CompositeColumn } from "../../Core/Table/CompositeColumn.js";
 import { toStringCells as toStringCells_1 } from "./CompositeCell.js";
+import { defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { map as map_2, singleton as singleton_1, ofArray } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { FsCell } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
+import { FsCell } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCell.fs.js";
 
 /**
  * Checks if the column header is a deprecated IO Header. If so, fixes it.
@@ -53,19 +54,20 @@ export function fromFsColumns(columns) {
 export function toStringCellColumns(column) {
     const hasUnit = exists((c) => c.isUnitized, column.Cells);
     const isTerm = column.Header.IsTermColumn;
-    const isData = column.Header.IsDataColumn;
+    const isData = column.Header.IsDataColumn && exists((c_1) => c_1.isData, column.Cells);
     const header = toStringCells(hasUnit, column.Header);
     const cells = map((cell) => toStringCells_1(isTerm, hasUnit, cell), column.Cells);
+    const getCellOrDefault = (ri, ci, cells_1) => defaultArg(tryItem(ci, item(ri, cells_1)), "");
     if (hasUnit) {
-        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i) => item(0, item(i, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_1) => item(1, item(i_1, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_2) => item(2, item(i_2, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(3, header)), delay(() => map_1((i_3) => item(3, item(i_3, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))]);
+        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i) => getCellOrDefault(i, 0, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_1) => getCellOrDefault(i_1, 1, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_2) => getCellOrDefault(i_2, 2, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(3, header)), delay(() => map_1((i_3) => getCellOrDefault(i_3, 3, cells), rangeDouble(0, 1, column.Cells.length - 1))))))]);
     }
     else if (isTerm) {
-        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_4) => item(0, item(i_4, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_5) => item(1, item(i_5, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_6) => item(2, item(i_6, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))]);
+        return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_4) => getCellOrDefault(i_4, 0, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_5) => getCellOrDefault(i_5, 1, cells), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_6) => getCellOrDefault(i_6, 2, cells), rangeDouble(0, 1, column.Cells.length - 1))))))]);
     }
     else if (isData) {
-        const hasFormat = exists((c_1) => (c_1.AsData.Format != null), column.Cells);
-        const hasSelectorFormat = exists((c_2) => (c_2.AsData.SelectorFormat != null), column.Cells);
-        return toList(delay(() => append(singleton(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_7) => item(0, item(i_7, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))), delay(() => append(hasFormat ? singleton(toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_8) => item(1, item(i_8, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty(), delay(() => (hasSelectorFormat ? singleton(toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_9) => item(2, item(i_9, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty())))))));
+        const hasFormat = exists((c_2) => (c_2.ToDataCell().AsData.Format != null), column.Cells);
+        const hasSelectorFormat = exists((c_3) => (c_3.ToDataCell().AsData.SelectorFormat != null), column.Cells);
+        return toList(delay(() => append(singleton(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_7) => getCellOrDefault(i_7, 0, cells), rangeDouble(0, 1, column.Cells.length - 1))))))), delay(() => append(hasFormat ? singleton(toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_8) => getCellOrDefault(i_8, 1, cells), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty(), delay(() => (hasSelectorFormat ? singleton(toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_9) => getCellOrDefault(i_9, 2, cells), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty())))))));
     }
     else {
         return singleton_1(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_10) => item(0, item(i_10, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))));

package/Spreadsheet/ArcAssay.js

@@ -1,5 +1,5 @@
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
-import { iterate, isEmpty as isEmpty_1, choose, tryHead, head, exists, map, singleton, append, delay, iterateIndexed } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
+import { iterate, isEmpty as isEmpty_1, tryPick, choose, tryHead, head, exists, map, singleton, append, delay, iterateIndexed } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { SparseRowModule_tryGetValueAt, SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
 import { fromRows as fromRows_1, toRows as toRows_1 } from "./Metadata/Assays.js";
 import { empty, isEmpty, ofSeq, singleton as singleton_1 } from "../fable_modules/fable-library-js.4.16.0/List.js";
@@ -8,11 +8,12 @@ import { toConsole, printf, toFail } from "../fable_modules/fable-library-js.4.1
 import { getEnumerator } from "../fable_modules/fable-library-js.4.16.0/Util.js";
 import { ArcAssay } from "../Core/ArcTypes.js";
 import { createMissingIdentifier } from "../Core/Helper/Identifier.js";
-import { defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.js";
-import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+import { toArray, defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { toFsWorksheet as toFsWorksheet_1, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
+import { toFsWorksheet, tryFromFsWorksheet as tryFromFsWorksheet_1 } from "./DataMapTable/DataMapTable.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
-export function toMetadataSheet(assay) {
+export function ArcAssay_toMetadataSheet(assay) {
     let assay_1;
     const sheet = new FsWorksheet("isa_assay");
     iterateIndexed((rowI, r) => {
@@ -21,7 +22,7 @@ export function toMetadataSheet(assay) {
     return sheet;
 }
 
-export function fromMetadataSheet(sheet) {
+export function ArcAssay_fromMetadataSheet(sheet) {
     try {
         const rows_1 = map(SparseRowModule_fromFsRow, sheet.Rows);
         const patternInput = exists((row) => {
@@ -117,7 +118,7 @@ export function fromMetadataSheet(sheet) {
 /**
  * Reads an assay from a spreadsheet
  */
-export function fromFsWorkbook(doc) {
+export function ARCtrl_ArcAssay__ArcAssay_fromFsWorkbook_Static_32154C9D(doc) {
     try {
         let assayMetaData;
         const matchValue = doc.TryGetWorksheetByName("isa_assay");
@@ -128,16 +129,19 @@ export function fromFsWorkbook(doc) {
                 assayMetaData = ArcAssay.create(createMissingIdentifier());
             }
             else {
-                assayMetaData = fromMetadataSheet(matchValue_1);
+                assayMetaData = ArcAssay_fromMetadataSheet(matchValue_1);
             }
         }
         else {
-            assayMetaData = fromMetadataSheet(matchValue);
+            assayMetaData = ArcAssay_fromMetadataSheet(matchValue);
         }
-        const annotationTables = choose(tryFromFsWorksheet, doc.GetWorksheets());
+        const sheets = doc.GetWorksheets();
+        const annotationTables = choose(tryFromFsWorksheet, sheets);
+        const datamapSheet = tryPick(tryFromFsWorksheet_1, sheets);
         if (!isEmpty_1(annotationTables)) {
             assayMetaData.Tables = Array.from(annotationTables);
         }
+        assayMetaData.DataMap = datamapSheet;
         return assayMetaData;
     }
     catch (err) {
@@ -146,13 +150,25 @@ export function fromFsWorkbook(doc) {
     }
 }
 
-export function toFsWorkbook(assay) {
+/**
+ * Write an assay to a spreadsheet
+ * 
+ * If datamapSheet is true, the datamap will be written to a worksheet inside assay workbook.
+ */
+export function ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F(assay, datamapSheet) {
+    const datamapSheet_1 = defaultArg(datamapSheet, true);
     const doc = new FsWorkbook();
-    const metaDataSheet = toMetadataSheet(assay);
+    const metaDataSheet = ArcAssay_toMetadataSheet(assay);
     doc.AddWorksheet(metaDataSheet);
-    iterate((arg) => {
-        const sheet = toFsWorksheet(arg);
-        doc.AddWorksheet(sheet);
+    if (datamapSheet_1) {
+        iterate((arg) => {
+            const sheet = toFsWorksheet(arg);
+            doc.AddWorksheet(sheet);
+        }, toArray(assay.DataMap));
+    }
+    iterate((arg_1) => {
+        const sheet_1 = toFsWorksheet_1(arg_1);
+        doc.AddWorksheet(sheet_1);
     }, assay.Tables);
     return doc;
 }

package/Spreadsheet/ArcInvestigation.js

@@ -17,8 +17,8 @@ import { toRows as toRows_4, fromRows as fromRows_4 } from "./Metadata/Study.js"
 import { iterateIndexed, map as map_1, toList, collect, singleton, append as append_1, delay } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { tryFind, ofList } from "../fable_modules/fable-library-js.4.16.0/Map.js";
 import { printf, toFail } from "../fable_modules/fable-library-js.4.16.0/String.js";
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
 export class InvestigationInfo extends Record {
     constructor(Identifier, Title, Description, SubmissionDate, PublicReleaseDate, Comments) {

package/Spreadsheet/ArcStudy.js

@@ -1,16 +1,17 @@
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
-import { map, append, iterateIndexed } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
+import { iterate, tryPick, map, append, iterateIndexed } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
 import { fromRows as fromRows_1, toRows } from "./Metadata/Study.js";
 import { toConsole, printf, toFail } from "../fable_modules/fable-library-js.4.16.0/String.js";
-import { defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { toArray, defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.js";
 import { getEnumerator } from "../fable_modules/fable-library-js.4.16.0/Util.js";
 import { ArcStudy } from "../Core/ArcTypes.js";
 import { createMissingIdentifier } from "../Core/Helper/Identifier.js";
 import { empty } from "../fable_modules/fable-library-js.4.16.0/List.js";
 import { ResizeArray_iter, ResizeArray_isEmpty, ResizeArray_choose } from "../Core/Helper/Collections.js";
-import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+import { toFsWorksheet as toFsWorksheet_1, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
+import { toFsWorksheet, tryFromFsWorksheet as tryFromFsWorksheet_1 } from "./DataMapTable/DataMapTable.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
 export function ArcStudy_toMetadataSheet(study, assays) {
     let source_1;
@@ -53,10 +54,13 @@ export function ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D(doc) {
             patternInput = ArcStudy_fromMetadataSheet(matchValue);
         }
         const studyMetadata = patternInput[0];
-        const annotationTables = ResizeArray_choose(tryFromFsWorksheet, doc.GetWorksheets());
+        const sheets = doc.GetWorksheets();
+        const annotationTables = ResizeArray_choose(tryFromFsWorksheet, sheets);
+        const datamapSheet = tryPick(tryFromFsWorksheet_1, sheets);
         if (!ResizeArray_isEmpty(annotationTables)) {
             studyMetadata.Tables = annotationTables;
         }
+        studyMetadata.DataMap = datamapSheet;
         return [studyMetadata, patternInput[1]];
     }
     catch (err) {
@@ -65,13 +69,25 @@ export function ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D(doc) {
     }
 }
 
-export function ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_353D0DB7(study, assays) {
+/**
+ * Write a study to a spreadsheet
+ * 
+ * If datamapSheet is true, the datamap will be written to a worksheet inside study workbook. Default: true
+ */
+export function ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522(study, assays, datamapSheet) {
+    const datamapSheet_1 = defaultArg(datamapSheet, true);
     const doc = new FsWorkbook();
     const metaDataSheet = ArcStudy_toMetadataSheet(study, assays);
     doc.AddWorksheet(metaDataSheet);
-    ResizeArray_iter((arg) => {
-        const sheet = toFsWorksheet(arg);
-        doc.AddWorksheet(sheet);
+    if (datamapSheet_1) {
+        iterate((arg) => {
+            const sheet = toFsWorksheet(arg);
+            doc.AddWorksheet(sheet);
+        }, toArray(study.DataMap));
+    }
+    ResizeArray_iter((arg_1) => {
+        const sheet_1 = toFsWorksheet_1(arg_1);
+        doc.AddWorksheet(sheet_1);
     }, study.Tables);
     return doc;
 }

package/Spreadsheet/DataMap.js

@@ -1,10 +1,10 @@
 import { printf, toFail } from "../fable_modules/fable-library-js.4.16.0/String.js";
 import { tryPick } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./DataMapTable/DataMapTable.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
 /**
- * Reads an assay from a spreadsheet
+ * Reads an datamap from a spreadsheet
  */
 export function fromFsWorkbook(doc) {
     try {

package/Spreadsheet/DataMapTable/DataMapColumn.js

@@ -4,7 +4,7 @@ import { tryFind, singleton as singleton_1, append, delay, map as map_1, collect
 import { distinct } from "../../fable_modules/fable-library-js.4.16.0/Seq2.js";
 import { bind, defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { stringHash } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
-import { FsCell } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
+import { FsCell } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCell.fs.js";
 import { DataContext__get_GeneratedBy, DataContext__get_Description, DataContext__get_ObjectType, DataContext__get_Unit, DataContext__get_Explication } from "../../Core/DataContext.js";
 
 export function setFromFsColumns(dc, columns) {

package/Spreadsheet/DataMapTable/DataMapHeader.js

@@ -7,7 +7,7 @@ import { Comment$ } from "../../Core/Comment.js";
 import { ActivePatterns_$007CComment$007C_$007C } from "../../Core/Helper/Regex.js";
 import { printf, toFail, join } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { map as map_2, append, delay, toList } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
-import { FsCell } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
+import { FsCell } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCell.fs.js";
 
 export function ActivePattern_ontologyAnnotationFromFsCells(tsrCol, tanCol, cells) {
     const cellValues = map((c) => c.ValueAsString(), cells);

package/Spreadsheet/DataMapTable/DataMapTable.js

@@ -1,17 +1,17 @@
 import { iterateIndexed, head, length, iterate, exists, ofArray } from "../../fable_modules/fable-library-js.4.16.0/List.js";
 import { Aux_List_groupWhen } from "../AnnotationTable/ArcTable.js";
 import { toList, map, delay, toArray, item, tryFind } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
-import { DataContext_$ctor_Z2FD70A12 } from "../../Core/DataContext.js";
+import { DataContext_$ctor_Z780A8A2A } from "../../Core/DataContext.js";
 import { rangeDouble } from "../../fable_modules/fable-library-js.4.16.0/Range.js";
 import { toFsColumns, setFromFsColumns } from "./DataMapColumn.js";
 import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { DataMap__get_DataContexts, DataMap_$ctor_4E3220A7 } from "../../Core/Table/DataMap.js";
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
-import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
-import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
-import { Dictionary_tryGet } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCellsCollection.fs.js";
+import { DataMap__get_DataContexts, DataMap_$ctor_4E3220A7 } from "../../Core/DataMap.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
+import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.2.0/Ranges/FsRangeAddress.fs.js";
+import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.2.0/FsAddress.fs.js";
+import { Dictionary_tryGet } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCellsCollection.fs.js";
 import { addToDict } from "../../fable_modules/fable-library-js.4.16.0/MapUtil.js";
-import { FsRangeBase__Cell_Z3407A44B } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeBase.fs.js";
+import { FsRangeBase__Cell_Z3407A44B } from "../../fable_modules/FsSpreadsheet.6.2.0/Ranges/FsRangeBase.fs.js";
 
 export const helperColumnStrings = ofArray(["Term Source REF", "Term Accession Number", "Data Format", "Data Selector Format"]);
 
@@ -34,7 +34,7 @@ export function tryDataMapTable(sheet) {
  */
 export function composeColumns(columns) {
     const l = (item(0, columns).MaxRowIndex - 1) | 0;
-    const dc = Array.from(toArray(delay(() => map((i) => DataContext_$ctor_Z2FD70A12(), rangeDouble(0, 1, l - 1)))));
+    const dc = Array.from(toArray(delay(() => map((i) => DataContext_$ctor_Z780A8A2A(), rangeDouble(0, 1, l - 1)))));
     iterate((arg) => {
         setFromFsColumns(dc, arg);
     }, groupColumnsByHeader(toList(columns)));

package/Spreadsheet/Metadata/SparseTable.js

@@ -2,14 +2,14 @@ import { append as append_1, delay, tryItem, length as length_1, isEmpty, iterat
 import { defaultArg, map as map_1 } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { tryFind, ofSeq } from "../../fable_modules/fable-library-js.4.16.0/Map.js";
 import { arrayHash, equalArrays, equals, comparePrimitives } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
-import { RowBuilder_get_Empty, RowBuilder__Combine_19F30600, RowBuilder_$ctor } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/RowBuilder.fs.js";
-import { CellBuilder_$ctor, CellBuilder__AsCellElement_6F87C2ED } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/CellBuilder.fs.js";
-import { Messages_format, SheetEntity$1_some_2B595 } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/Types.fs.js";
-import { DataType } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
+import { RowBuilder_get_Empty, RowBuilder__Combine_19F30600, RowBuilder_$ctor } from "../../fable_modules/FsSpreadsheet.6.2.0/DSL/RowBuilder.fs.js";
+import { CellBuilder_$ctor, CellBuilder__AsCellElement_6F87C2ED } from "../../fable_modules/FsSpreadsheet.6.2.0/DSL/CellBuilder.fs.js";
+import { Messages_format, SheetEntity$1_some_2B595 } from "../../fable_modules/FsSpreadsheet.6.2.0/DSL/Types.fs.js";
+import { DataType } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCell.fs.js";
 import { map as map_2, initialize as initialize_1, exists, find, cons, append, empty, singleton } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { ColumnIndex, RowElement } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/Types.fs.js";
-import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
-import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
+import { ColumnIndex, RowElement } from "../../fable_modules/FsSpreadsheet.6.2.0/DSL/Types.fs.js";
+import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.2.0/Ranges/FsRangeAddress.fs.js";
+import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.2.0/FsAddress.fs.js";
 import { Record } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
 import { record_type, list_type, class_type, tuple_type, int32_type, string_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { Seq_trySkip, Dictionary_tryGetValue } from "../CollectionAux.js";

package/Spreadsheet/Template.js

@@ -15,10 +15,10 @@ import { toArray } from "../fable_modules/fable-library-js.4.16.0/Option.js";
 import { toRows as toRows_1, fromRows as fromRows_1 } from "./Metadata/Contacts.js";
 import { parse } from "../fable_modules/fable-library-js.4.16.0/Guid.js";
 import { Template, Organisation } from "../Core/Template.js";
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
 import { now } from "../fable_modules/fable-library-js.4.16.0/Date.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
 export class TemplateReadError extends FSharpException {
     constructor(Data0) {

package/ValidationPackages/ValidationPackage.js

@@ -0,0 +1,54 @@
+import { unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { stringHash, equals } from "../fable_modules/fable-library-js.4.16.0/Util.js";
+import { boxHashOption, boxHashArray } from "../Core/Helper/HashCodes.js";
+import { class_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
+
+export class ValidationPackage {
+    constructor(name, version) {
+        this._name = name;
+        this._version = version;
+    }
+    get Name() {
+        const this$ = this;
+        return this$._name;
+    }
+    set Name(name) {
+        const this$ = this;
+        this$._name = name;
+    }
+    get Version() {
+        const this$ = this;
+        return unwrap(this$._version);
+    }
+    set Version(version) {
+        const this$ = this;
+        this$._version = version;
+    }
+    static make(name, version) {
+        return new ValidationPackage(name, unwrap(version));
+    }
+    Copy() {
+        const this$ = this;
+        const name = this$.Name;
+        const version = this$.Version;
+        return ValidationPackage.make(name, version);
+    }
+    Equals(obj) {
+        let other_vp;
+        const this$ = this;
+        return (obj instanceof ValidationPackage) && ((other_vp = obj, (other_vp.Name === this$.Name) && equals(other_vp.Version, this$.Version)));
+    }
+    GetHashCode() {
+        const this$ = this;
+        return boxHashArray([stringHash(this$.Name), boxHashOption(this$.Version)]) | 0;
+    }
+}
+
+export function ValidationPackage_$reflection() {
+    return class_type("ARCtrl.ValidationPackages.ValidationPackage", void 0, ValidationPackage);
+}
+
+export function ValidationPackage_$ctor_27AED5E3(name, version) {
+    return new ValidationPackage(name, version);
+}
+

package/ValidationPackages/ValidationPackagesConfig.js

@@ -0,0 +1,55 @@
+import { unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { equalsWith } from "../fable_modules/fable-library-js.4.16.0/Array.js";
+import { identityHash, equals } from "../fable_modules/fable-library-js.4.16.0/Util.js";
+import { boxHashOption, boxHashArray } from "../Core/Helper/HashCodes.js";
+import { class_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
+
+export class ValidationPackagesConfig {
+    constructor(validation_packages, arc_specification) {
+        this._validation_packages = validation_packages;
+        this._arc_specification = arc_specification;
+    }
+    get ValidationPackages() {
+        const this$ = this;
+        return this$._validation_packages;
+    }
+    set ValidationPackages(validation_packages) {
+        const this$ = this;
+        this$._validation_packages = validation_packages;
+    }
+    get ARCSpecification() {
+        const this$ = this;
+        return unwrap(this$._arc_specification);
+    }
+    set ARCSpecification(arc_specification) {
+        const this$ = this;
+        this$._arc_specification = arc_specification;
+    }
+    static make(validation_packages, arc_specification) {
+        return new ValidationPackagesConfig(validation_packages, unwrap(arc_specification));
+    }
+    Copy() {
+        const this$ = this;
+        const validation_packages = this$.ValidationPackages;
+        const arc_specification = this$.ARCSpecification;
+        return ValidationPackagesConfig.make(validation_packages, arc_specification);
+    }
+    Equals(obj) {
+        let other_vpc;
+        const this$ = this;
+        return (obj instanceof ValidationPackagesConfig) && ((other_vpc = obj, equalsWith(equals, other_vpc.ValidationPackages, this$.ValidationPackages) && equals(other_vpc.ARCSpecification, this$.ARCSpecification)));
+    }
+    GetHashCode() {
+        const this$ = this;
+        return boxHashArray([identityHash(this$.ValidationPackages), boxHashOption(this$.ARCSpecification)]) | 0;
+    }
+}
+
+export function ValidationPackagesConfig_$reflection() {
+    return class_type("ARCtrl.ValidationPackages.ValidationPackagesConfig", void 0, ValidationPackagesConfig);
+}
+
+export function ValidationPackagesConfig_$ctor_376974AD(validation_packages, arc_specification) {
+    return new ValidationPackagesConfig(validation_packages, arc_specification);
+}
+