npm - @nfdi4plants/arctrl - Versions diffs - 3.0.0-beta.13 → 3.0.0-beta.15 - Mend

@nfdi4plants/arctrl 3.0.0-beta.13 → 3.0.0-beta.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (63) hide show

package/dist/ts/ts/Core/{DataMap.js → Datamap.js} RENAMED Viewed

@@ -8,18 +8,18 @@ import { DataContext__get_Explication, DataContext__set_Explication_279AAFF2, Da
 import { hash, boxHashSeq } from './Helper/HashCodes.js';
 import { class_type } from '../../node_modules/@fable-org/fable-library-js/Reflection.js';
-const DataMapAux_dataHeader = CompositeHeader_Input(IOType_Data());
-const DataMapAux_explication = new OntologyAnnotation("Clarification", "NCIT", "http://purl.obolibrary.org/obo/NCIT_C94778");
-const DataMapAux_explicationHeader = CompositeHeader_Parameter(DataMapAux_explication);
-const DataMapAux_unit = new OntologyAnnotation("Unit", "UO", "http://purl.obolibrary.org/obo/UO_0000000");
-const DataMapAux_unitHeader = CompositeHeader_Parameter(DataMapAux_unit);
-const DataMapAux_objectType = new OntologyAnnotation("Data Type", "NCIT", "http://purl.obolibrary.org/obo/NCIT_C42645");
-const DataMapAux_objectTypeHeader = CompositeHeader_Parameter(DataMapAux_objectType);
-const DataMapAux_labelHeader = CompositeHeader_FreeText("Label");
-const DataMapAux_descriptionHeader = CompositeHeader_FreeText("Description");
-const DataMapAux_generatedByHeader = CompositeHeader_FreeText("Generated By");
-const DataMapAux_allowedHeaders = ofArray([DataMapAux_dataHeader, DataMapAux_explicationHeader, DataMapAux_unitHeader, DataMapAux_objectTypeHeader, DataMapAux_descriptionHeader, DataMapAux_generatedByHeader]);
-function DataMapAux_getOntologyColumn(f, dataContexts) {
+const DatamapAux_dataHeader = CompositeHeader_Input(IOType_Data());
+const DatamapAux_explication = new OntologyAnnotation("Clarification", "NCIT", "http://purl.obolibrary.org/obo/NCIT_C94778");
+const DatamapAux_explicationHeader = CompositeHeader_Parameter(DatamapAux_explication);
+const DatamapAux_unit = new OntologyAnnotation("Unit", "UO", "http://purl.obolibrary.org/obo/UO_0000000");
+const DatamapAux_unitHeader = CompositeHeader_Parameter(DatamapAux_unit);
+const DatamapAux_objectType = new OntologyAnnotation("Data Type", "NCIT", "http://purl.obolibrary.org/obo/NCIT_C42645");
+const DatamapAux_objectTypeHeader = CompositeHeader_Parameter(DatamapAux_objectType);
+const DatamapAux_labelHeader = CompositeHeader_FreeText("Label");
+const DatamapAux_descriptionHeader = CompositeHeader_FreeText("Description");
+const DatamapAux_generatedByHeader = CompositeHeader_FreeText("Generated By");
+const DatamapAux_allowedHeaders = ofArray([DatamapAux_dataHeader, DatamapAux_explicationHeader, DatamapAux_unitHeader, DatamapAux_objectTypeHeader, DatamapAux_descriptionHeader, DatamapAux_generatedByHeader]);
+function DatamapAux_getOntologyColumn(f, dataContexts) {
   const collection = map((dc) => {
     const matchValue = f(dc);
     if (matchValue == null) {
@@ -30,7 +30,7 @@ function DataMapAux_getOntologyColumn(f, dataContexts) {
   }, dataContexts);
   return Array.from(collection);
 }
-function DataMapAux_getStringColumn(f, dataContexts) {
+function DatamapAux_getStringColumn(f, dataContexts) {
   const collection = map((dc) => {
     const matchValue = f(dc);
     if (matchValue == null) {
@@ -41,7 +41,7 @@ function DataMapAux_getStringColumn(f, dataContexts) {
   }, dataContexts);
   return Array.from(collection);
 }
-function DataMapAux_setOntologyColumn(f, column, dataContexts) {
+function DatamapAux_setOntologyColumn(f, column, dataContexts) {
   iterateIndexed((i, cell) => {
     if (cell.tag === /* Term */
     0) {
@@ -50,7 +50,7 @@ function DataMapAux_setOntologyColumn(f, column, dataContexts) {
     }
   }, column);
 }
-function DataMapAux_setStringColumn(f, column, dataContexts) {
+function DatamapAux_setStringColumn(f, column, dataContexts) {
   iterateIndexed((i, cell) => {
     if (cell.tag === /* FreeText */
     1) {
@@ -59,7 +59,7 @@ function DataMapAux_setStringColumn(f, column, dataContexts) {
     }
   }, column);
 }
-function DataMapAux_SanityChecks_rowIndexInBoundaries(row, dataContexts) {
+function DatamapAux_SanityChecks_rowIndexInBoundaries(row, dataContexts) {
   if (row < 0) {
     throw new Error("Row index must be greater or equal to 0.");
   }
@@ -67,12 +67,12 @@ function DataMapAux_SanityChecks_rowIndexInBoundaries(row, dataContexts) {
     throw new Error("Row index must be less than the number of rows.");
   }
 }
-function DataMapAux_SanityChecks_lengthOfNewColumn(newColumn, dataContexts) {
+function DatamapAux_SanityChecks_lengthOfNewColumn(newColumn, dataContexts) {
   if (newColumn.length !== dataContexts.length) {
     throw new Error("Length of new column does not match length of data contexts.");
   }
 }
-class DataMap {
+class Datamap {
   constructor(dataContexts) {
     this.staticHash = 0;
     this["dataContexts@108"] = dataContexts;
@@ -90,61 +90,61 @@ class DataMap {
     return this$["dataContexts@108"];
   }
   static init() {
-    return new DataMap([]);
+    return new Datamap([]);
   }
   GetExplicationColumn() {
     const this$ = this;
-    return DataMapAux_getOntologyColumn(DataContext__get_Explication, this$["dataContexts@108"]);
+    return DatamapAux_getOntologyColumn(DataContext__get_Explication, this$["dataContexts@108"]);
   }
   SetExplicationColumn(cells) {
     const this$ = this;
-    DataMapAux_setOntologyColumn((dc, oa) => {
+    DatamapAux_setOntologyColumn((dc, oa) => {
       DataContext__set_Explication_279AAFF2(dc, oa);
     }, cells, this$["dataContexts@108"]);
   }
   GetUnitColumn() {
     const this$ = this;
-    return DataMapAux_getOntologyColumn(DataContext__get_Unit, this$["dataContexts@108"]);
+    return DatamapAux_getOntologyColumn(DataContext__get_Unit, this$["dataContexts@108"]);
   }
   SetUnitColumn(cells) {
     const this$ = this;
-    DataMapAux_setOntologyColumn((dc, oa) => {
+    DatamapAux_setOntologyColumn((dc, oa) => {
       DataContext__set_Unit_279AAFF2(dc, oa);
     }, cells, this$["dataContexts@108"]);
   }
   GetObjectTypeColumn() {
     const this$ = this;
-    return DataMapAux_getOntologyColumn(DataContext__get_ObjectType, this$["dataContexts@108"]);
+    return DatamapAux_getOntologyColumn(DataContext__get_ObjectType, this$["dataContexts@108"]);
   }
   SetDataTypeColumn(cells) {
     const this$ = this;
-    DataMapAux_setOntologyColumn((dc, oa) => {
+    DatamapAux_setOntologyColumn((dc, oa) => {
       DataContext__set_ObjectType_279AAFF2(dc, oa);
     }, cells, this$["dataContexts@108"]);
   }
   GetLabelColumn() {
     const this$ = this;
-    return DataMapAux_getStringColumn((dc) => dc.Name, this$["dataContexts@108"]);
+    return DatamapAux_getStringColumn((dc) => dc.Name, this$["dataContexts@108"]);
   }
   SetLabelColumn(cells) {
     const this$ = this;
-    DataMapAux_setStringColumn((dc, s) => {
+    DatamapAux_setStringColumn((dc, s) => {
       dc.Name = s;
     }, cells, this$["dataContexts@108"]);
   }
   GetDescriptionColumn() {
     const this$ = this;
-    return DataMapAux_getStringColumn(DataContext__get_Description, this$["dataContexts@108"]);
+    return DatamapAux_getStringColumn(DataContext__get_Description, this$["dataContexts@108"]);
   }
   SetDescriptionColumn(cells) {
     const this$ = this;
-    DataMapAux_setStringColumn((dc, s) => {
+    DatamapAux_setStringColumn((dc, s) => {
       DataContext__set_Description_6DFDD678(dc, s);
     }, cells, this$["dataContexts@108"]);
   }
   GetDataContext(row, SkipValidation) {
     const this$ = this;
-    DataMapAux_SanityChecks_rowIndexInBoundaries(row, this$["dataContexts@108"]);
+    DatamapAux_SanityChecks_rowIndexInBoundaries(row, this$["dataContexts@108"]);
     return this$["dataContexts@108"][row];
   }
   static getDataContext(row, SkipValidation) {
@@ -153,7 +153,7 @@ class DataMap {
   Copy() {
     let collection;
     const this$ = this;
-    return new DataMap((collection = map(DataContext__Copy, this$["dataContexts@108"]), Array.from(collection)));
+    return new Datamap((collection = map(DataContext__Copy, this$["dataContexts@108"]), Array.from(collection)));
   }
   Equals(obj) {
     const this$ = this;
@@ -167,11 +167,11 @@ class DataMap {
     return "isa.datamap.xlsx";
   }
 }
-function DataMap_$reflection() {
-  return class_type("ARCtrl.DataMap", void 0, DataMap);
+function Datamap_$reflection() {
+  return class_type("ARCtrl.Datamap", void 0, Datamap);
 }
-function DataMap_$ctor_4E3220A7(dataContexts) {
-  return new DataMap(dataContexts);
+function Datamap_$ctor_4E3220A7(dataContexts) {
+  return new Datamap(dataContexts);
 }
-export { DataMap, DataMapAux_SanityChecks_lengthOfNewColumn, DataMapAux_SanityChecks_rowIndexInBoundaries, DataMapAux_allowedHeaders, DataMapAux_dataHeader, DataMapAux_descriptionHeader, DataMapAux_explication, DataMapAux_explicationHeader, DataMapAux_generatedByHeader, DataMapAux_getOntologyColumn, DataMapAux_getStringColumn, DataMapAux_labelHeader, DataMapAux_objectType, DataMapAux_objectTypeHeader, DataMapAux_setOntologyColumn, DataMapAux_setStringColumn, DataMapAux_unit, DataMapAux_unitHeader, DataMap_$ctor_4E3220A7, DataMap_$reflection };
+export { Datamap, DatamapAux_SanityChecks_lengthOfNewColumn, DatamapAux_SanityChecks_rowIndexInBoundaries, DatamapAux_allowedHeaders, DatamapAux_dataHeader, DatamapAux_descriptionHeader, DatamapAux_explication, DatamapAux_explicationHeader, DatamapAux_generatedByHeader, DatamapAux_getOntologyColumn, DatamapAux_getStringColumn, DatamapAux_labelHeader, DatamapAux_objectType, DatamapAux_objectTypeHeader, DatamapAux_setOntologyColumn, DatamapAux_setStringColumn, DatamapAux_unit, DatamapAux_unitHeader, Datamap_$ctor_4E3220A7, Datamap_$reflection };

package/dist/ts/ts/FileSystem/FileSystemTree.d.ts CHANGED Viewed

@@ -41,10 +41,10 @@ export declare class FileSystemTree<Tag extends keyof FileSystemTree_$cases> ext
     static createGitKeepFile(): FileSystemTree_$union;
     static createReadmeFile(): FileSystemTree_$union;
     static createEmptyFolder(name: string): FileSystemTree_$union;
-    static createAssayFolder(assayName: string, hasDataMap?: boolean): FileSystemTree_$union;
-    static createStudyFolder(studyName: string, hasDataMap?: boolean): FileSystemTree_$union;
-    static createWorkflowFolder(workflowName: string, hasCWL?: boolean, hasDataMap?: boolean): FileSystemTree_$union;
-    static createRunFolder(runName: string, hasCWL?: boolean, hasYML?: boolean, hasDataMap?: boolean): FileSystemTree_$union;
+    static createAssayFolder(assayName: string, hasDatamap?: boolean): FileSystemTree_$union;
+    static createStudyFolder(studyName: string, hasDatamap?: boolean): FileSystemTree_$union;
+    static createWorkflowFolder(workflowName: string, hasCWL?: boolean, hasDatamap?: boolean): FileSystemTree_$union;
+    static createRunFolder(runName: string, hasCWL?: boolean, hasYML?: boolean, hasDatamap?: boolean): FileSystemTree_$union;
     static createInvestigationFile(): FileSystemTree_$union;
     static createLicenseFile(): FileSystemTree_$union;
     static createAssaysFolder(assays: FileSystemTree_$union[]): FileSystemTree_$union;

package/dist/ts/ts/FileSystem/FileSystemTree.js CHANGED Viewed

@@ -272,46 +272,46 @@ class FileSystemTree extends Union {
   static createEmptyFolder(name) {
     return FileSystemTree.createFolder(name, [FileSystemTree.createGitKeepFile()]);
   }
-  static createAssayFolder(assayName, hasDataMap) {
-    const hasDataMap_1 = defaultArg(hasDataMap, false);
+  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");
-    if (hasDataMap_1) {
-      const dataMapFile = FileSystemTree.createFile("isa.datamap.xlsx");
-      return FileSystemTree.createFolder(assayName, [dataset, protocols, assayFile, readme, dataMapFile]);
+    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, hasDataMap) {
-    const hasDataMap_1 = defaultArg(hasDataMap, false);
+  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");
-    if (hasDataMap_1) {
-      const dataMapFile = FileSystemTree.createFile("isa.datamap.xlsx");
-      return FileSystemTree.createFolder(studyName, [resources, protocols, studyFile, readme, dataMapFile]);
+    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 createWorkflowFolder(workflowName, hasCWL, hasDataMap) {
-    const hasDataMap_1 = defaultArg(hasDataMap, false);
+  static createWorkflowFolder(workflowName, hasCWL, hasDatamap) {
+    const hasDatamap_1 = defaultArg(hasDatamap, false);
     const hasCWL_1 = defaultArg(hasCWL, false);
     const readme = FileSystemTree.createReadmeFile();
     const workflowFile = FileSystemTree.createFile("isa.workflow.xlsx");
-    return FileSystemTree.createFolder(workflowName, toArray(delay(() => append(singleton(workflowFile), delay(() => append(singleton(readme), delay(() => append(hasCWL_1 ? singleton(FileSystemTree.createFile("workflow.cwl")) : empty$1(), delay(() => hasDataMap_1 ? singleton(FileSystemTree.createFile("isa.datamap.xlsx")) : empty$1())))))))));
+    return FileSystemTree.createFolder(workflowName, toArray(delay(() => append(singleton(workflowFile), delay(() => append(singleton(readme), delay(() => append(hasCWL_1 ? singleton(FileSystemTree.createFile("workflow.cwl")) : empty$1(), delay(() => hasDatamap_1 ? singleton(FileSystemTree.createFile("isa.datamap.xlsx")) : empty$1())))))))));
   }
-  static createRunFolder(runName, hasCWL, hasYML, hasDataMap) {
-    const hasDataMap_1 = defaultArg(hasDataMap, false);
+  static createRunFolder(runName, hasCWL, hasYML, hasDatamap) {
+    const hasDatamap_1 = defaultArg(hasDatamap, false);
     const hasCWL_1 = defaultArg(hasCWL, false);
     const hasYML_1 = defaultArg(hasYML, false);
     const readme = FileSystemTree.createReadmeFile();
     const runFile = FileSystemTree.createFile("isa.run.xlsx");
-    return FileSystemTree.createFolder(runName, toArray(delay(() => append(singleton(runFile), delay(() => append(singleton(readme), delay(() => append(hasCWL_1 ? singleton(FileSystemTree.createFile("run.cwl")) : empty$1(), delay(() => append(hasYML_1 ? singleton(FileSystemTree.createFile("run.yml")) : empty$1(), delay(() => hasDataMap_1 ? singleton(FileSystemTree.createFile("isa.datamap.xlsx")) : empty$1())))))))))));
+    return FileSystemTree.createFolder(runName, toArray(delay(() => append(singleton(runFile), delay(() => append(singleton(readme), delay(() => append(hasCWL_1 ? singleton(FileSystemTree.createFile("run.cwl")) : empty$1(), delay(() => append(hasYML_1 ? singleton(FileSystemTree.createFile("run.yml")) : empty$1(), delay(() => hasDatamap_1 ? singleton(FileSystemTree.createFile("isa.datamap.xlsx")) : empty$1())))))))))));
   }
   static createInvestigationFile() {
     return FileSystemTree.createFile("isa.investigation.xlsx");

package/dist/ts/ts/Json/Assay.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { choose, ofArray, singleton, empty } from '../../node_modules/@fable-org
 import { map, unwrap, defaultArg, value, bind } from '../../node_modules/@fable-org/fable-library-js/Option.js';
 import { tryInclude, tryIncludeSeq, tryIncludeList } from './Encode.js';
 import { OntologyAnnotation_encoder, OntologyAnnotation_decoder, OntologyAnnotation_ROCrate_encoderPropertyValue, OntologyAnnotation_ROCrate_encoderDefinedTerm, OntologyAnnotation_ROCrate_decoderPropertyValue, OntologyAnnotation_ROCrate_decoderDefinedTerm, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from './OntologyAnnotation.js';
-import { encoder as encoder$1, decoder as decoder$2, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$2 } from './DataMap/DataMap.js';
+import { encoder as encoder$1, decoder as decoder$2, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$2 } from './Datamap/Datamap.js';
 import { encoder as encoder$2, decoder as decoder$1, encoderCompressed as encoderCompressed$1, decoderCompressed as decoderCompressed$1 } from './Table/ArcTable.js';
 import { encoder as encoder$3, decoder as decoder$3, ROCrate_encoder as ROCrate_encoder$1, ROCrate_decoder as ROCrate_decoder$2 } from './Person.js';
 import { encoder as encoder$4, decoder as decoder$4, ROCrate_encoder as ROCrate_encoder$4, ROCrate_decoder as ROCrate_decoder$3, ISAJson_encoder as ISAJson_encoder$3, ISAJson_decoder as ISAJson_decoder$2 } from './Comment.js';
@@ -38,7 +38,7 @@ function encoder(assay) {
     Encode(helpers_2) {
       return helpers_2.encodeString(value_3);
     }
-  }), assay.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, assay.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, assay.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, assay.TechnologyPlatform), tryInclude("DataMap", encoder$1, assay.DataMap), tryIncludeSeq("Tables", encoder$2, assay.Tables), tryIncludeSeq("Performers", encoder$3, assay.Performers), tryIncludeSeq("Comments", encoder$4, assay.Comments)]));
+  }), assay.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, assay.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, assay.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, assay.TechnologyPlatform), tryInclude("Datamap", encoder$1, assay.Datamap), tryIncludeSeq("Tables", encoder$2, assay.Tables), tryIncludeSeq("Performers", encoder$3, assay.Performers), tryIncludeSeq("Comments", encoder$4, assay.Comments)]));
   return {
     Encode(helpers_3) {
       const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values_1);
@@ -48,7 +48,7 @@ function encoder(assay) {
 }
 const decoder = object((get$) => {
   let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, arg_13, objectArg_6, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9;
-  return ArcAssay.create((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("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_13 = resizeArray(decoder$1), objectArg_6 = get$.Optional, objectArg_6.Field("Tables", arg_13))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("DataMap", decoder$2))), unwrap((arg_17 = resizeArray(decoder$3), objectArg_8 = get$.Optional, objectArg_8.Field("Performers", arg_17))), unwrap((arg_19 = resizeArray(decoder$4), objectArg_9 = get$.Optional, objectArg_9.Field("Comments", arg_19))));
+  return ArcAssay.create((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("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_13 = resizeArray(decoder$1), objectArg_6 = get$.Optional, objectArg_6.Field("Tables", arg_13))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("Datamap", decoder$2))), unwrap((arg_17 = resizeArray(decoder$3), objectArg_8 = get$.Optional, objectArg_8.Field("Performers", arg_17))), unwrap((arg_19 = resizeArray(decoder$4), objectArg_9 = get$.Optional, objectArg_9.Field("Comments", arg_19))));
 });
 function encoderCompressed(stringTable, oaTable, cellTable, assay) {
   let value;
@@ -64,7 +64,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, assay) {
     Encode(helpers_2) {
       return helpers_2.encodeString(value_3);
     }
-  }), assay.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, assay.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, assay.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, assay.TechnologyPlatform), tryIncludeSeq("Tables", (table) => encoderCompressed$1(stringTable, oaTable, cellTable, table), assay.Tables), tryInclude("DataMap", (dm) => encoderCompressed$2(stringTable, oaTable, cellTable, dm), assay.DataMap), tryIncludeSeq("Performers", encoder$3, assay.Performers), tryIncludeSeq("Comments", encoder$4, assay.Comments)]));
+  }), assay.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, assay.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, assay.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, assay.TechnologyPlatform), tryIncludeSeq("Tables", (table) => encoderCompressed$1(stringTable, oaTable, cellTable, table), assay.Tables), tryInclude("Datamap", (dm) => encoderCompressed$2(stringTable, oaTable, cellTable, dm), assay.Datamap), tryIncludeSeq("Performers", encoder$3, assay.Performers), tryIncludeSeq("Comments", encoder$4, assay.Comments)]));
   return {
     Encode(helpers_3) {
       const arg = map$1((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values_1);
@@ -75,7 +75,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, assay) {
 function decoderCompressed(stringTable, oaTable, cellTable) {
   return object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9;
-    return ArcAssay.create((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("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_13 = resizeArray(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_6 = get$.Optional, objectArg_6.Field("Tables", arg_13))), unwrap((arg_15 = decoderCompressed$2(stringTable, oaTable, cellTable), objectArg_7 = get$.Optional, objectArg_7.Field("DataMap", arg_15))), unwrap((arg_17 = resizeArray(decoder$3), objectArg_8 = get$.Optional, objectArg_8.Field("Performers", arg_17))), unwrap((arg_19 = resizeArray(decoder$4), objectArg_9 = get$.Optional, objectArg_9.Field("Comments", arg_19))));
+    return ArcAssay.create((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("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_13 = resizeArray(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_6 = get$.Optional, objectArg_6.Field("Tables", arg_13))), unwrap((arg_15 = decoderCompressed$2(stringTable, oaTable, cellTable), objectArg_7 = get$.Optional, objectArg_7.Field("Datamap", arg_15))), unwrap((arg_17 = resizeArray(decoder$3), objectArg_8 = get$.Optional, objectArg_8.Field("Performers", arg_17))), unwrap((arg_19 = resizeArray(decoder$4), objectArg_9 = get$.Optional, objectArg_9.Field("Comments", arg_19))));
   });
 }
 function ROCrate_genID(a) {

package/dist/ts/ts/Json/{DataMap → Datamap}/DataContext.d.ts.map RENAMED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DataContext.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/~~DataMap~~/DataContext.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAKjH,OAAO,EAA+B,WAAW,EAAwK,MAAM,2BAA2B,CAAC;AAK3P,wBAAgB,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,UAAU,CAoBnD;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,WAAW,CAMzC,CAAC"}
1	+ {"version":3,"file":"DataContext.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Datamap/DataContext.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AAKjH,OAAO,EAA+B,WAAW,EAAwK,MAAM,2BAA2B,CAAC;AAK3P,wBAAgB,OAAO,CAAC,EAAE,EAAE,WAAW,GAAG,UAAU,CAoBnD;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,WAAW,CAMzC,CAAC"}

package/dist/ts/ts/Json/{DataMap/DataMap.d.ts → Datamap/Datamap.d.ts} RENAMED Viewed

@@ -1,11 +1,11 @@
 import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
-import { DataMap } from '../../Core/DataMap.js';
+import { Datamap } from '../../Core/Datamap.js';
 import { IMap } from '@fable-org/fable-library-js/Util.js';
 import { int32 } from '@fable-org/fable-library-js/Int32.js';
 import { OntologyAnnotation } from '../../Core/OntologyAnnotation.js';
 import { CompositeCell_$union } from '../../Core/Table/CompositeCell.js';
-export declare function encoder(dm: DataMap): IEncodable;
-export declare const decoder: Decoder$1<DataMap>;
-export declare function encoderCompressed(stringTable: IMap<string, int32>, oaTable: IMap<OntologyAnnotation, int32>, cellTable: IMap<CompositeCell_$union, int32>, dm: DataMap): IEncodable;
-export declare function decoderCompressed(stringTable: string[], oaTable: OntologyAnnotation[], cellTable: CompositeCell_$union[]): Decoder$1<DataMap>;
-//# sourceMappingURL=DataMap.d.ts.map
+export declare function encoder(dm: Datamap): IEncodable;
+export declare const decoder: Decoder$1<Datamap>;
+export declare function encoderCompressed(stringTable: IMap<string, int32>, oaTable: IMap<OntologyAnnotation, int32>, cellTable: IMap<CompositeCell_$union, int32>, dm: Datamap): IEncodable;
+export declare function decoderCompressed(stringTable: string[], oaTable: OntologyAnnotation[], cellTable: CompositeCell_$union[]): Decoder$1<Datamap>;
+//# sourceMappingURL=Datamap.d.ts.map

package/dist/ts/ts/Json/{DataMap/DataMap.d.ts.map → Datamap/Datamap.d.ts.map} RENAMED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"~~DataMap~~.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/~~DataMap~~/~~DataMap~~.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AACjH,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,wBAAgB,OAAO,CAAC,EAAE,EAAE,OAAO,GAAG,UAAU,CAQ/C;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,OAAO,CAGrC,CAAC;AAEH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,OAAO,GAAG,UAAU,CAEnL;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,CAE7I"}
1	+ {"version":3,"file":"Datamap.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/Datamap/Datamap.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAqB,UAAU,EAAE,MAAM,uDAAuD,CAAC;AACjH,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,wBAAgB,OAAO,CAAC,EAAE,EAAE,OAAO,GAAG,UAAU,CAQ/C;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,OAAO,CAGrC,CAAC;AAEH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,OAAO,GAAG,UAAU,CAEnL;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,CAE7I"}

package/dist/ts/ts/Json/{DataMap/DataMap.js → Datamap/Datamap.js} RENAMED Viewed

@@ -1,7 +1,7 @@
 import { seq } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
 import { map } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { encoder as encoder$1, decoder as decoder$1 } from './DataContext.js';
-import { DataMap } from '../../Core/DataMap.js';
+import { Datamap } from '../../Core/Datamap.js';
 import { object, resizeArray } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 function encoder(dm) {
@@ -15,7 +15,7 @@ function encoder(dm) {
 }
 const decoder = object((get$) => {
   let arg_1, objectArg;
-  return new DataMap((arg_1 = resizeArray(decoder$1), objectArg = get$.Required, objectArg.Field("dataContexts", arg_1)));
+  return new Datamap((arg_1 = resizeArray(decoder$1), objectArg = get$.Required, objectArg.Field("dataContexts", arg_1)));
 });
 function encoderCompressed(stringTable, oaTable, cellTable, dm) {
   return encoder(dm);

package/dist/ts/ts/Json/ROCrate/LDNode.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import { Decoder$1, IEncodable } from '../../fable_modules/Thoth.Json.Core.0.7.0
 import { LDNode } from '../../ROCrate/LDObject.js';
 export declare function genericEncoder(obj: any): IEncodable;
 export declare function encoder(obj: LDNode): IEncodable;
+export declare const nullDecoder: Decoder$1<void>;
 /**
  * Returns a decoder
  *

package/dist/ts/ts/Json/ROCrate/LDNode.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"LDNode.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/ROCrate/LDNode.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAA+F~~,SAAS,~~EAAE~~,UAAU,EAAqB,MAAM,uDAAuD,CAAC;AAG9M,OAAO,EAAE,MAAM,EAAkB,MAAM,2BAA2B,CAAC;AAgBnE,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CA+DnD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CA6B/C;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,~~CA0FhE~~;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,MAAM,CAAuE,CAAC;AAE9G,eAAO,MAAM,cAAc,EAAE,SAAS,CAAC,GAAG,CAAqB,CAAC"}
1	+ {"version":3,"file":"LDNode.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Json/ROCrate/LDNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,SAAS,EAAuE,UAAU,EAAqB,MAAM,uDAAuD,CAAC;AAG9M,OAAO,EAAE,MAAM,EAAkB,MAAM,2BAA2B,CAAC;AAgBnE,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CA+DnD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CA6B/C;AAED,eAAO,MAAM,WAAW,EAAE,SAAS,CAAC,IAAI,CAIvC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAgGhE;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,MAAM,CAAuE,CAAC;AAE9G,eAAO,MAAM,cAAc,EAAE,SAAS,CAAC,GAAG,CAAqB,CAAC"}

package/dist/ts/ts/Json/ROCrate/LDNode.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { ErrorReason$1_BadOneOf, ErrorReason$1_BadPrimitive } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
+import { ErrorReason$1_BadPrimitive, ErrorReason$1_BadOneOf } from '../../fable_modules/Thoth.Json.Core.0.7.0/Types.fs.js';
 import { dateTime, resizeArrayOrSingleton } from '../Encode.js';
 import { LDValue, LDRef, LDNode } from '../../ROCrate/LDObject.js';
 import { encoder as encoder$1, decoder as decoder$2 } from './LDValue.js';
@@ -8,10 +8,10 @@ import { list } from '../../fable_modules/Thoth.Json.Core.0.7.0/Encode.fs.js';
 import { toList, delay, map, enumerateFromFunctions, append, singleton, empty, collect } from '../../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { encoder as encoder$3, decoder as decoder$1 } from './LDContext.js';
 import { value, unwrap } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
-import { Getters$2_$ctor_Z4BE6C149, string, Getters$2__get_Errors, map as map$1, oneOf, int, decimal } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
+import { FSharpResult$2_Ok, FSharpResult$2_Error } from '../../../node_modules/@fable-org/fable-library-js/Result.js';
+import { Getters$2_$ctor_Z4BE6C149, string, Getters$2__get_Errors, map as map$1, oneOf, int, decimal, bool } from '../../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
 import { Decode_resizeArrayOrSingleton, Helpers_prependPath } from '../Decode.js';
 import { isEmpty, length, head, ofArray } from '../../../node_modules/@fable-org/fable-library-js/List.js';
-import { FSharpResult$2_Error, FSharpResult$2_Ok } from '../../../node_modules/@fable-org/fable-library-js/Result.js';
 import { fold } from '../../../node_modules/@fable-org/fable-library-js/Array.js';
 function genericEncoder(obj) {
@@ -98,11 +98,16 @@ function encoder(obj) {
     }
   };
 }
+const nullDecoder = {
+  Decode(helpers, value) {
+    return helpers.isNullValue(value) ? FSharpResult$2_Ok(void 0) : FSharpResult$2_Error(["", ErrorReason$1_BadPrimitive("null", value)]);
+  }
+};
 function getDecoder(expectObject) {
   const decode = (expectObject_1) => {
     const decodeObject = {
       Decode(helpers, value$1) {
-        let arg_7, objectArg_3, arg_9, objectArg_4;
+        let arg_7, objectArg_3;
         if (helpers.isObject(value$1)) {
           const getters = Getters$2_$ctor_Z4BE6C149(helpers, value$1);
           const properties = helpers.getProperties(value$1);
@@ -124,7 +129,13 @@ function getDecoder(expectObject) {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
               const property = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
               if (property !== "@id" && property !== "@type" && property !== "@context") {
-                o.SetProperty(property, (arg_9 = decode(false), objectArg_4 = get$.Required, objectArg_4.Field(property, arg_9)));
+                let r;
+                const arg_9 = decode(false);
+                const objectArg_4 = get$.Required;
+                r = objectArg_4.Field(property, arg_9);
+                if (!equals(r, defaultOf())) {
+                  o.SetProperty(property, r);
+                }
               }
             }
           } finally {
@@ -179,7 +190,7 @@ function getDecoder(expectObject) {
     if (expectObject_1) {
       return map$1((value_4) => value_4, decodeObject);
     } else {
-      return oneOf(ofArray([map$1((value_5) => value_5, decoder$2), map$1((value_6) => value_6, decodeObject), map$1((value_7) => value_7, decoder$3), map$1((value_8) => value_8, resizeArray), map$1((value_9) => value_9, string), map$1((value_10) => value_10, int), map$1((value_11) => value_11, decimal)]));
+      return oneOf(ofArray([map$1((value_5) => value_5, decoder$2), map$1((value_6) => value_6, decodeObject), map$1((value_7) => value_7, decoder$3), map$1((value_8) => value_8, resizeArray), map$1((value_9) => value_9, string), map$1((value_10) => value_10, int), map$1((value_11) => value_11, decimal), map$1((value_12) => value_12, bool), map$1(() => void 0, nullDecoder)]));
     }
   };
   return decode(expectObject);
@@ -187,4 +198,4 @@ function getDecoder(expectObject) {
 const decoder = map$1((value) => value, getDecoder(true));
 const genericDecoder = getDecoder(false);
-export { decoder, encoder, genericDecoder, genericEncoder, getDecoder };
+export { decoder, encoder, genericDecoder, genericEncoder, getDecoder, nullDecoder };

package/dist/ts/ts/Json/Run.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { choose, ofArray } from '../../node_modules/@fable-org/fable-library-js/
 import { map, unwrap } from '../../node_modules/@fable-org/fable-library-js/Option.js';
 import { tryInclude, tryIncludeSeq } from './Encode.js';
 import { OntologyAnnotation_encoder, OntologyAnnotation_decoder } from './OntologyAnnotation.js';
-import { encoder as encoder$1, decoder as decoder$2, encoderCompressed as encoderCompressed$1, decoderCompressed as decoderCompressed$2 } from './DataMap/DataMap.js';
+import { encoder as encoder$1, decoder as decoder$2, encoderCompressed as encoderCompressed$1, decoderCompressed as decoderCompressed$2 } from './Datamap/Datamap.js';
 import { encoder as encoder$2, decoder as decoder$1, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$1 } from './Table/ArcTable.js';
 import { encoder as encoder$3, decoder as decoder$3 } from './Person.js';
 import { encoder as encoder$4, decoder as decoder$4 } from './Comment.js';
@@ -24,7 +24,7 @@ function encoder(run) {
     Encode(helpers_2) {
       return helpers_2.encodeString(value_3);
     }
-  }), run.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, run.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, run.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, run.TechnologyPlatform), tryInclude("DataMap", encoder$1, run.DataMap), tryIncludeSeq("WorkflowIdentifiers", (value_5) => ({
+  }), run.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, run.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, run.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, run.TechnologyPlatform), tryInclude("Datamap", encoder$1, run.Datamap), tryIncludeSeq("WorkflowIdentifiers", (value_5) => ({
     Encode(helpers_3) {
       return helpers_3.encodeString(value_5);
     }
@@ -38,7 +38,7 @@ function encoder(run) {
 }
 const decoder = object((get$) => {
   let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10;
-  return ArcRun.create((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("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_13 = resizeArray(string), objectArg_6 = get$.Optional, objectArg_6.Field("WorkflowIdentifiers", arg_13))), unwrap((arg_15 = resizeArray(decoder$1), objectArg_7 = get$.Optional, objectArg_7.Field("Tables", arg_15))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("DataMap", decoder$2))), unwrap((arg_19 = resizeArray(decoder$3), objectArg_9 = get$.Optional, objectArg_9.Field("Performers", arg_19))), void 0, void 0, unwrap((arg_21 = resizeArray(decoder$4), objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21))));
+  return ArcRun.create((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("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_13 = resizeArray(string), objectArg_6 = get$.Optional, objectArg_6.Field("WorkflowIdentifiers", arg_13))), unwrap((arg_15 = resizeArray(decoder$1), objectArg_7 = get$.Optional, objectArg_7.Field("Tables", arg_15))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("Datamap", decoder$2))), unwrap((arg_19 = resizeArray(decoder$3), objectArg_9 = get$.Optional, objectArg_9.Field("Performers", arg_19))), void 0, void 0, unwrap((arg_21 = resizeArray(decoder$4), objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21))));
 });
 function encoderCompressed(stringTable, oaTable, cellTable, run) {
   let value;
@@ -54,7 +54,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, run) {
     Encode(helpers_2) {
       return helpers_2.encodeString(value_3);
     }
-  }), run.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, run.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, run.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, run.TechnologyPlatform), tryInclude("DataMap", (dm) => encoderCompressed$1(stringTable, oaTable, cellTable, dm), run.DataMap), tryIncludeSeq("WorkflowIdentifiers", (value_5) => ({
+  }), run.Description), tryInclude("MeasurementType", OntologyAnnotation_encoder, run.MeasurementType), tryInclude("TechnologyType", OntologyAnnotation_encoder, run.TechnologyType), tryInclude("TechnologyPlatform", OntologyAnnotation_encoder, run.TechnologyPlatform), tryInclude("Datamap", (dm) => encoderCompressed$1(stringTable, oaTable, cellTable, dm), run.Datamap), tryIncludeSeq("WorkflowIdentifiers", (value_5) => ({
     Encode(helpers_3) {
       return helpers_3.encodeString(value_5);
     }
@@ -69,7 +69,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, run) {
 function decoderCompressed(stringTable, oaTable, cellTable) {
   return object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10;
-    return ArcRun.create((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("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_13 = resizeArray(string), objectArg_6 = get$.Optional, objectArg_6.Field("WorkflowIdentifiers", arg_13))), unwrap((arg_15 = resizeArray(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_7 = get$.Optional, objectArg_7.Field("Tables", arg_15))), unwrap((arg_17 = decoderCompressed$2(stringTable, oaTable, cellTable), objectArg_8 = get$.Optional, objectArg_8.Field("DataMap", arg_17))), unwrap((arg_19 = resizeArray(decoder$3), objectArg_9 = get$.Optional, objectArg_9.Field("Performers", arg_19))), void 0, void 0, unwrap((arg_21 = resizeArray(decoder$4), objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21))));
+    return ArcRun.create((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("MeasurementType", OntologyAnnotation_decoder))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("TechnologyType", OntologyAnnotation_decoder))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("TechnologyPlatform", OntologyAnnotation_decoder))), unwrap((arg_13 = resizeArray(string), objectArg_6 = get$.Optional, objectArg_6.Field("WorkflowIdentifiers", arg_13))), unwrap((arg_15 = resizeArray(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_7 = get$.Optional, objectArg_7.Field("Tables", arg_15))), unwrap((arg_17 = decoderCompressed$2(stringTable, oaTable, cellTable), objectArg_8 = get$.Optional, objectArg_8.Field("Datamap", arg_17))), unwrap((arg_19 = resizeArray(decoder$3), objectArg_9 = get$.Optional, objectArg_9.Field("Performers", arg_19))), void 0, void 0, unwrap((arg_21 = resizeArray(decoder$4), objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21))));
   });
 }

package/dist/ts/ts/Json/Study.js CHANGED Viewed

@@ -7,7 +7,7 @@ import { encoder as encoder$1, decoder as decoder$1, ROCrate_encoder as ROCrate_
 import { encoder as encoder$2, decoder as decoder$2, ROCrate_encoder as ROCrate_encoder$2, ROCrate_decoder as ROCrate_decoder$4, ISAJson_encoder as ISAJson_encoder$3, ISAJson_decoder as ISAJson_decoder$3 } from './Person.js';
 import { OntologyAnnotation_encoder, OntologyAnnotation_decoder, OntologyAnnotation_ROCrate_encoderDefinedTerm, OntologyAnnotation_ROCrate_decoderDefinedTerm, OntologyAnnotation_ISAJson_encoder, OntologyAnnotation_ISAJson_decoder } from './OntologyAnnotation.js';
 import { encoder as encoder$3, decoder as decoder$3, encoderCompressed as encoderCompressed$1, decoderCompressed as decoderCompressed$1 } from './Table/ArcTable.js';
-import { encoder as encoder$4, decoder as decoder$4, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$2 } from './DataMap/DataMap.js';
+import { encoder as encoder$4, decoder as decoder$4, encoderCompressed as encoderCompressed$2, decoderCompressed as decoderCompressed$2 } from './Datamap/Datamap.js';
 import { encoder as encoder$5, decoder as decoder$5, ROCrate_encoder as ROCrate_encoder$6, ROCrate_decoder as ROCrate_decoder$5, ISAJson_encoder as ISAJson_encoder$6, ISAJson_decoder as ISAJson_decoder$5 } from './Comment.js';
 import { map as map$1, isEmpty } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
 import { object, string, resizeArray, list as list$1 } from '../fable_modules/Thoth.Json.Core.0.7.0/Decode.fs.js';
@@ -57,7 +57,7 @@ function encoder(study) {
     Encode(helpers_4) {
       return helpers_4.encodeString(value_7);
     }
-  }), study.PublicReleaseDate), tryIncludeSeq("Publications", encoder$1, study.Publications), tryIncludeSeq("Contacts", encoder$2, study.Contacts), tryIncludeSeq("StudyDesignDescriptors", OntologyAnnotation_encoder, study.StudyDesignDescriptors), tryIncludeSeq("Tables", encoder$3, study.Tables), tryInclude("DataMap", encoder$4, study.DataMap), tryIncludeSeq("RegisteredAssayIdentifiers", (value_9) => ({
+  }), study.PublicReleaseDate), tryIncludeSeq("Publications", encoder$1, study.Publications), tryIncludeSeq("Contacts", encoder$2, study.Contacts), tryIncludeSeq("StudyDesignDescriptors", OntologyAnnotation_encoder, study.StudyDesignDescriptors), tryIncludeSeq("Tables", encoder$3, study.Tables), tryInclude("Datamap", encoder$4, study.Datamap), tryIncludeSeq("RegisteredAssayIdentifiers", (value_9) => ({
     Encode(helpers_5) {
       return helpers_5.encodeString(value_9);
     }
@@ -71,7 +71,7 @@ function encoder(study) {
 }
 const 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, 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 = resizeArray(decoder$1), objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11))), unwrap((arg_13 = resizeArray(decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13))), unwrap((arg_15 = resizeArray(OntologyAnnotation_decoder), objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15))), unwrap((arg_17 = resizeArray(decoder$3), objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17))), unwrap((objectArg_9 = get$.Optional, objectArg_9.Field("DataMap", decoder$4))), unwrap((arg_21 = resizeArray(string), objectArg_10 = get$.Optional, objectArg_10.Field("RegisteredAssayIdentifiers", arg_21))), unwrap((arg_23 = resizeArray(decoder$5), objectArg_11 = get$.Optional, objectArg_11.Field("Comments", arg_23))));
+  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 = resizeArray(decoder$1), objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11))), unwrap((arg_13 = resizeArray(decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13))), unwrap((arg_15 = resizeArray(OntologyAnnotation_decoder), objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15))), unwrap((arg_17 = resizeArray(decoder$3), objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17))), unwrap((objectArg_9 = get$.Optional, objectArg_9.Field("Datamap", decoder$4))), unwrap((arg_21 = resizeArray(string), objectArg_10 = get$.Optional, objectArg_10.Field("RegisteredAssayIdentifiers", arg_21))), unwrap((arg_23 = resizeArray(decoder$5), objectArg_11 = get$.Optional, objectArg_11.Field("Comments", arg_23))));
 });
 function encoderCompressed(stringTable, oaTable, cellTable, study) {
   let value;
@@ -95,7 +95,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, study) {
     Encode(helpers_4) {
       return helpers_4.encodeString(value_7);
     }
-  }), study.PublicReleaseDate), tryIncludeSeq("Publications", encoder$1, study.Publications), tryIncludeSeq("Contacts", encoder$2, study.Contacts), tryIncludeSeq("StudyDesignDescriptors", OntologyAnnotation_encoder, study.StudyDesignDescriptors), tryIncludeSeq("Tables", (table) => encoderCompressed$1(stringTable, oaTable, cellTable, table), study.Tables), tryInclude("DataMap", (dm) => encoderCompressed$2(stringTable, oaTable, cellTable, dm), study.DataMap), tryIncludeSeq("RegisteredAssayIdentifiers", (value_9) => ({
+  }), study.PublicReleaseDate), tryIncludeSeq("Publications", encoder$1, study.Publications), tryIncludeSeq("Contacts", encoder$2, study.Contacts), tryIncludeSeq("StudyDesignDescriptors", OntologyAnnotation_encoder, study.StudyDesignDescriptors), tryIncludeSeq("Tables", (table) => encoderCompressed$1(stringTable, oaTable, cellTable, table), study.Tables), tryInclude("Datamap", (dm) => encoderCompressed$2(stringTable, oaTable, cellTable, dm), study.Datamap), tryIncludeSeq("RegisteredAssayIdentifiers", (value_9) => ({
     Encode(helpers_5) {
       return helpers_5.encodeString(value_9);
     }
@@ -110,7 +110,7 @@ function encoderCompressed(stringTable, oaTable, cellTable, study) {
 function 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, 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 = resizeArray(decoder$1), objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11))), unwrap((arg_13 = resizeArray(decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13))), unwrap((arg_15 = resizeArray(OntologyAnnotation_decoder), objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15))), unwrap((arg_17 = resizeArray(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17))), unwrap((arg_19 = decoderCompressed$2(stringTable, oaTable, cellTable), objectArg_9 = get$.Optional, objectArg_9.Field("DataMap", arg_19))), unwrap((arg_21 = resizeArray(string), objectArg_10 = get$.Optional, objectArg_10.Field("RegisteredAssayIdentifiers", arg_21))), unwrap((arg_23 = resizeArray(decoder$5), objectArg_11 = get$.Optional, objectArg_11.Field("Comments", arg_23))));
+    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 = resizeArray(decoder$1), objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11))), unwrap((arg_13 = resizeArray(decoder$2), objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13))), unwrap((arg_15 = resizeArray(OntologyAnnotation_decoder), objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15))), unwrap((arg_17 = resizeArray(decoderCompressed$1(stringTable, oaTable, cellTable)), objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17))), unwrap((arg_19 = decoderCompressed$2(stringTable, oaTable, cellTable), objectArg_9 = get$.Optional, objectArg_9.Field("Datamap", arg_19))), unwrap((arg_21 = resizeArray(string), objectArg_10 = get$.Optional, objectArg_10.Field("RegisteredAssayIdentifiers", arg_21))), unwrap((arg_23 = resizeArray(decoder$5), objectArg_11 = get$.Optional, objectArg_11.Field("Comments", arg_23))));
   });
 }
 function ROCrate_genID(a) {