@nfdi4plants/arctrl 2.0.0-alpha.2 → 2.0.0-alpha.4

package/Core/ArcTypes.js

@@ -1,7 +1,8 @@
-import { value as value_4, defaultArg, unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
-import { collect, append as append_3, tryFind, removeAt, tryFindIndex, exists, choose, item, map, delay, toList, fold, length, forAll, contains, filter, toArray } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { value as value_4, defaultArg, map, unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { collect, append as append_3, tryFind, removeAt, tryFindIndex, exists, choose, item, map as map_1, delay, toList, fold, length, forAll, contains, filter, toArray } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { defaultOf, safeHash, equals, disposeSafe, getEnumerator, stringHash } from "../fable_modules/fable-library-js.4.16.0/Util.js";
 import { ResizeArray_choose, ResizeArray_filter, ResizeArray_map } from "./Helper/Collections.js";
+import { DataMap__Copy } from "./Table/DataMap.js";
 import { addRangeInPlace, removeInPlace, contains as contains_1 } from "../fable_modules/fable-library-js.4.16.0/Array.js";
 import { printf, toText } from "../fable_modules/fable-library-js.4.16.0/String.js";
 import { rangeDouble } from "../fable_modules/fable-library-js.4.16.0/Range.js";
@@ -12,7 +13,7 @@ import { Array_distinct } from "../fable_modules/fable-library-js.4.16.0/Seq2.js
 import { FSharpRef } from "../fable_modules/fable-library-js.4.16.0/Types.js";
 
 export class ArcAssay extends ArcTables {
-    constructor(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments) {
+    constructor(identifier, measurementType, technologyType, technologyPlatform, tables, datamap, performers, comments) {
         super(defaultArg(tables, []));
         const performers_1 = defaultArg(performers, []);
         const comments_1 = defaultArg(comments, []);
@@ -21,8 +22,9 @@ export class ArcAssay extends ArcTables {
         this["measurementType@111"] = measurementType;
         this["technologyType@112"] = technologyType;
         this["technologyPlatform@113"] = technologyPlatform;
-        this["performers@114-1"] = performers_1;
-        this["comments@115-1"] = comments_1;
+        this.dataMap = datamap;
+        this["performers@115-1"] = performers_1;
+        this["comments@116-1"] = comments_1;
         this.staticHash = 0;
     }
     get Identifier() {
@@ -65,21 +67,29 @@ export class ArcAssay extends ArcTables {
         const this$ = this;
         this$["technologyPlatform@113"] = n;
     }
+    get DataMap() {
+        const this$ = this;
+        return unwrap(this$.dataMap);
+    }
+    set DataMap(n) {
+        const this$ = this;
+        this$.dataMap = n;
+    }
     get Performers() {
         const this$ = this;
-        return this$["performers@114-1"];
+        return this$["performers@115-1"];
     }
     set Performers(n) {
         const this$ = this;
-        this$["performers@114-1"] = n;
+        this$["performers@115-1"] = n;
     }
     get Comments() {
         const this$ = this;
-        return this$["comments@115-1"];
+        return this$["comments@116-1"];
     }
     set Comments(n) {
         const this$ = this;
-        this$["comments@115-1"] = n;
+        this$["comments@116-1"] = n;
     }
     get StaticHash() {
         const this$ = this;
@@ -92,11 +102,11 @@ export class ArcAssay extends ArcTables {
     static init(identifier) {
         return new ArcAssay(identifier);
     }
-    static create(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments) {
-        return new ArcAssay(identifier, unwrap(measurementType), unwrap(technologyType), unwrap(technologyPlatform), unwrap(tables), unwrap(performers), unwrap(comments));
+    static create(identifier, measurementType, technologyType, technologyPlatform, tables, datamap, performers, comments) {
+        return new ArcAssay(identifier, unwrap(measurementType), unwrap(technologyType), unwrap(technologyPlatform), unwrap(tables), unwrap(datamap), unwrap(performers), unwrap(comments));
     }
-    static make(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments) {
-        return new ArcAssay(identifier, unwrap(measurementType), unwrap(technologyType), unwrap(technologyPlatform), tables, performers, comments);
+    static make(identifier, measurementType, technologyType, technologyPlatform, tables, datamap, performers, comments) {
+        return new ArcAssay(identifier, unwrap(measurementType), unwrap(technologyType), unwrap(technologyPlatform), tables, unwrap(datamap), performers, comments);
     }
     static get FileName() {
         return "isa.assay.xlsx";
@@ -354,12 +364,13 @@ export class ArcAssay extends ArcTables {
             disposeSafe(enumerator);
         }
         const nextComments = ResizeArray_map((c) => c.Copy(), this$.Comments);
+        const nextDataMap = map(DataMap__Copy, this$.DataMap);
         const nextPerformers = ResizeArray_map((c_1) => c_1.Copy(), this$.Performers);
         const identifier = this$.Identifier;
         const measurementType = this$.MeasurementType;
         const technologyType = this$.TechnologyType;
         const technologyPlatform = this$.TechnologyPlatform;
-        return ArcAssay.make(identifier, measurementType, technologyType, technologyPlatform, nextTables, nextPerformers, nextComments);
+        return ArcAssay.make(identifier, measurementType, technologyType, technologyPlatform, nextTables, nextDataMap, nextPerformers, nextComments);
     }
     UpdateBy(assay, onlyReplaceExisting, appendSequences) {
         const this$ = this;
@@ -542,6 +553,7 @@ export class ArcAssay extends ArcTables {
         if ((assay.Comments.length !== 0) ? true : updateAlways) {
             this$.Comments = assay.Comments;
         }
+        this$.DataMap = assay.DataMap;
         if ((assay.Performers.length !== 0) ? true : updateAlways) {
             this$.Performers = assay.Performers;
         }
@@ -549,28 +561,28 @@ export class ArcAssay extends ArcTables {
     StructurallyEquals(other) {
         let a, b, a_1, b_1, a_2, b_2;
         const this$ = this;
-        return forAll((x) => (x === true), [this$.Identifier === other.Identifier, equals(this$.MeasurementType, other.MeasurementType), equals(this$.TechnologyType, other.TechnologyType), equals(this$.TechnologyPlatform, other.TechnologyPlatform), (a = this$.Tables, (b = other.Tables, (length(a) === length(b)) && fold((acc, e) => {
+        return forAll((x) => (x === true), [this$.Identifier === other.Identifier, equals(this$.MeasurementType, other.MeasurementType), equals(this$.TechnologyType, other.TechnologyType), equals(this$.TechnologyPlatform, other.TechnologyPlatform), equals(this$.DataMap, other.DataMap), (a = this$.Tables, (b = other.Tables, (length(a) === length(b)) && fold((acc, e) => {
             if (acc) {
                 return e;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_1) => equals(item(i_1, a), item(i_1, b)), rangeDouble(0, 1, length(a) - 1))))))), (a_1 = this$.Performers, (b_1 = other.Performers, (length(a_1) === length(b_1)) && fold((acc_1, e_1) => {
+        }, true, toList(delay(() => map_1((i_1) => equals(item(i_1, a), item(i_1, b)), rangeDouble(0, 1, length(a) - 1))))))), (a_1 = this$.Performers, (b_1 = other.Performers, (length(a_1) === length(b_1)) && fold((acc_1, e_1) => {
             if (acc_1) {
                 return e_1;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_2) => equals(item(i_2, a_1), item(i_2, b_1)), rangeDouble(0, 1, length(a_1) - 1))))))), (a_2 = this$.Comments, (b_2 = other.Comments, (length(a_2) === length(b_2)) && fold((acc_2, e_2) => {
+        }, true, toList(delay(() => map_1((i_2) => equals(item(i_2, a_1), item(i_2, b_1)), rangeDouble(0, 1, length(a_1) - 1))))))), (a_2 = this$.Comments, (b_2 = other.Comments, (length(a_2) === length(b_2)) && fold((acc_2, e_2) => {
             if (acc_2) {
                 return e_2;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_3) => equals(item(i_3, a_2), item(i_3, b_2)), rangeDouble(0, 1, length(a_2) - 1)))))))]);
+        }, true, toList(delay(() => map_1((i_3) => equals(item(i_3, a_2), item(i_3, b_2)), rangeDouble(0, 1, length(a_2) - 1)))))))]);
     }
     ReferenceEquals(other) {
         const this$ = this;
@@ -581,48 +593,53 @@ export class ArcAssay extends ArcTables {
         const this$ = this;
         return (other instanceof ArcAssay) && ((assay = other, this$.StructurallyEquals(assay)));
     }
-    GetHashCode() {
+    GetLightHashCode() {
         const this$ = this;
         return boxHashArray([this$.Identifier, boxHashOption(this$.MeasurementType), boxHashOption(this$.TechnologyType), boxHashOption(this$.TechnologyPlatform), boxHashSeq(this$.Tables), boxHashSeq(this$.Performers), boxHashSeq(this$.Comments)]) | 0;
     }
+    GetHashCode() {
+        const this$ = this;
+        return boxHashArray([this$.Identifier, boxHashOption(this$.MeasurementType), boxHashOption(this$.TechnologyType), boxHashOption(this$.TechnologyPlatform), boxHashOption(this$.DataMap), boxHashSeq(this$.Tables), boxHashSeq(this$.Performers), boxHashSeq(this$.Comments)]) | 0;
+    }
 }
 
 export function ArcAssay_$reflection() {
     return class_type("ARCtrl.ArcAssay", void 0, ArcAssay, ArcTables_$reflection());
 }
 
-export function ArcAssay_$ctor_1CE2732A(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments) {
-    return new ArcAssay(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments);
+export function ArcAssay_$ctor_Z4900C8CC(identifier, measurementType, technologyType, technologyPlatform, tables, datamap, performers, comments) {
+    return new ArcAssay(identifier, measurementType, technologyType, technologyPlatform, tables, datamap, performers, comments);
 }
 
 export class ArcStudy extends ArcTables {
-    constructor(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, registeredAssayIdentifiers, comments) {
+    constructor(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, datamap, registeredAssayIdentifiers, comments) {
         super(defaultArg(tables, []));
         const publications_1 = defaultArg(publications, []);
         const contacts_1 = defaultArg(contacts, []);
         const studyDesignDescriptors_1 = defaultArg(studyDesignDescriptors, []);
         const registeredAssayIdentifiers_1 = defaultArg(registeredAssayIdentifiers, []);
         const comments_1 = defaultArg(comments, []);
-        this["identifier@511"] = identifier;
+        this["identifier@533"] = identifier;
         this.investigation = void 0;
-        this["title@513"] = title;
-        this["description@514"] = description;
-        this["submissionDate@515"] = submissionDate;
-        this["publicReleaseDate@516"] = publicReleaseDate;
-        this["publications@517-1"] = publications_1;
-        this["contacts@518-1"] = contacts_1;
-        this["studyDesignDescriptors@519-1"] = studyDesignDescriptors_1;
-        this["registeredAssayIdentifiers@520-1"] = registeredAssayIdentifiers_1;
-        this["comments@521-1"] = comments_1;
+        this["title@535"] = title;
+        this["description@536"] = description;
+        this["submissionDate@537"] = submissionDate;
+        this["publicReleaseDate@538"] = publicReleaseDate;
+        this["publications@539-1"] = publications_1;
+        this["contacts@540-1"] = contacts_1;
+        this["studyDesignDescriptors@541-1"] = studyDesignDescriptors_1;
+        this["datamap@542"] = datamap;
+        this["registeredAssayIdentifiers@543-1"] = registeredAssayIdentifiers_1;
+        this["comments@544-1"] = comments_1;
         this.staticHash = 0;
     }
     get Identifier() {
         const this$ = this;
-        return this$["identifier@511"];
+        return this$["identifier@533"];
     }
     set Identifier(i) {
         const this$ = this;
-        this$["identifier@511"] = i;
+        this$["identifier@533"] = i;
     }
     get Investigation() {
         const this$ = this;
@@ -634,75 +651,83 @@ export class ArcStudy extends ArcTables {
     }
     get Title() {
         const this$ = this;
-        return unwrap(this$["title@513"]);
+        return unwrap(this$["title@535"]);
     }
     set Title(n) {
         const this$ = this;
-        this$["title@513"] = n;
+        this$["title@535"] = n;
     }
     get Description() {
         const this$ = this;
-        return unwrap(this$["description@514"]);
+        return unwrap(this$["description@536"]);
     }
     set Description(n) {
         const this$ = this;
-        this$["description@514"] = n;
+        this$["description@536"] = n;
     }
     get SubmissionDate() {
         const this$ = this;
-        return unwrap(this$["submissionDate@515"]);
+        return unwrap(this$["submissionDate@537"]);
     }
     set SubmissionDate(n) {
         const this$ = this;
-        this$["submissionDate@515"] = n;
+        this$["submissionDate@537"] = n;
     }
     get PublicReleaseDate() {
         const this$ = this;
-        return unwrap(this$["publicReleaseDate@516"]);
+        return unwrap(this$["publicReleaseDate@538"]);
     }
     set PublicReleaseDate(n) {
         const this$ = this;
-        this$["publicReleaseDate@516"] = n;
+        this$["publicReleaseDate@538"] = n;
     }
     get Publications() {
         const this$ = this;
-        return this$["publications@517-1"];
+        return this$["publications@539-1"];
     }
     set Publications(n) {
         const this$ = this;
-        this$["publications@517-1"] = n;
+        this$["publications@539-1"] = n;
     }
     get Contacts() {
         const this$ = this;
-        return this$["contacts@518-1"];
+        return this$["contacts@540-1"];
     }
     set Contacts(n) {
         const this$ = this;
-        this$["contacts@518-1"] = n;
+        this$["contacts@540-1"] = n;
     }
     get StudyDesignDescriptors() {
         const this$ = this;
-        return this$["studyDesignDescriptors@519-1"];
+        return this$["studyDesignDescriptors@541-1"];
     }
     set StudyDesignDescriptors(n) {
         const this$ = this;
-        this$["studyDesignDescriptors@519-1"] = n;
+        this$["studyDesignDescriptors@541-1"] = n;
+    }
+    get DataMap() {
+        const this$ = this;
+        return unwrap(this$["datamap@542"]);
+    }
+    set DataMap(n) {
+        const this$ = this;
+        this$["datamap@542"] = n;
     }
     get RegisteredAssayIdentifiers() {
         const this$ = this;
-        return this$["registeredAssayIdentifiers@520-1"];
+        return this$["registeredAssayIdentifiers@543-1"];
     }
     set RegisteredAssayIdentifiers(n) {
         const this$ = this;
-        this$["registeredAssayIdentifiers@520-1"] = n;
+        this$["registeredAssayIdentifiers@543-1"] = n;
     }
     get Comments() {
         const this$ = this;
-        return this$["comments@521-1"];
+        return this$["comments@544-1"];
     }
     set Comments(n) {
         const this$ = this;
-        this$["comments@521-1"] = n;
+        this$["comments@544-1"] = n;
     }
     get StaticHash() {
         const this$ = this;
@@ -715,11 +740,11 @@ export class ArcStudy extends ArcTables {
     static init(identifier) {
         return new ArcStudy(identifier);
     }
-    static create(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, registeredAssayIdentifiers, comments) {
-        return new ArcStudy(identifier, unwrap(title), unwrap(description), unwrap(submissionDate), unwrap(publicReleaseDate), unwrap(publications), unwrap(contacts), unwrap(studyDesignDescriptors), unwrap(tables), unwrap(registeredAssayIdentifiers), unwrap(comments));
+    static create(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, datamap, registeredAssayIdentifiers, comments) {
+        return new ArcStudy(identifier, unwrap(title), unwrap(description), unwrap(submissionDate), unwrap(publicReleaseDate), unwrap(publications), unwrap(contacts), unwrap(studyDesignDescriptors), unwrap(tables), unwrap(datamap), unwrap(registeredAssayIdentifiers), unwrap(comments));
     }
-    static make(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, registeredAssayIdentifiers, comments) {
-        return new ArcStudy(identifier, unwrap(title), unwrap(description), unwrap(submissionDate), unwrap(publicReleaseDate), publications, contacts, studyDesignDescriptors, tables, registeredAssayIdentifiers, comments);
+    static make(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, datamap, registeredAssayIdentifiers, comments) {
+        return new ArcStudy(identifier, unwrap(title), unwrap(description), unwrap(submissionDate), unwrap(publicReleaseDate), publications, contacts, studyDesignDescriptors, tables, unwrap(datamap), registeredAssayIdentifiers, comments);
     }
     get isEmpty() {
         const this$ = this;
@@ -1125,13 +1150,14 @@ export class ArcStudy extends ArcTables {
         const nextContacts = ResizeArray_map((c_1) => c_1.Copy(), this$.Contacts);
         const nextPublications = ResizeArray_map((c_2) => c_2.Copy(), this$.Publications);
         const nextStudyDesignDescriptors = ResizeArray_map((c_3) => c_3.Copy(), this$.StudyDesignDescriptors);
+        const nextDataMap = map(DataMap__Copy, this$.DataMap);
         let study;
         const identifier = this$.Identifier;
         const title = this$.Title;
         const description = this$.Description;
         const submissionDate = this$.SubmissionDate;
         const publicReleaseDate = this$.PublicReleaseDate;
-        study = ArcStudy.make(identifier, title, description, submissionDate, publicReleaseDate, nextPublications, nextContacts, nextStudyDesignDescriptors, nextTables, nextAssayIdentifiers, nextComments);
+        study = ArcStudy.make(identifier, title, description, submissionDate, publicReleaseDate, nextPublications, nextContacts, nextStudyDesignDescriptors, nextTables, nextDataMap, nextAssayIdentifiers, nextComments);
         if (copyInvestigationRef_1) {
             study.Investigation = this$.Investigation;
         }
@@ -1165,6 +1191,7 @@ export class ArcStudy extends ArcTables {
             const tables = ArcTables.updateReferenceTablesBySheets(new ArcTables(this$.Tables), new ArcTables(study.Tables), unwrap(keepUnusedRefTables));
             this$.Tables = tables.Tables;
         }
+        this$.DataMap = study.DataMap;
         if ((study.RegisteredAssayIdentifiers.length !== 0) ? true : updateAlways) {
             this$.RegisteredAssayIdentifiers = study.RegisteredAssayIdentifiers;
         }
@@ -1175,49 +1202,49 @@ export class ArcStudy extends ArcTables {
     StructurallyEquals(other) {
         let a, b, a_1, b_1, a_2, b_2, a_3, b_3, a_4, b_4, a_5, b_5;
         const this$ = this;
-        return forAll((x) => (x === true), [this$.Identifier === other.Identifier, equals(this$.Title, other.Title), equals(this$.Description, other.Description), equals(this$.SubmissionDate, other.SubmissionDate), equals(this$.PublicReleaseDate, other.PublicReleaseDate), (a = this$.Publications, (b = other.Publications, (length(a) === length(b)) && fold((acc, e) => {
+        return forAll((x) => (x === true), [this$.Identifier === other.Identifier, equals(this$.Title, other.Title), equals(this$.Description, other.Description), equals(this$.SubmissionDate, other.SubmissionDate), equals(this$.PublicReleaseDate, other.PublicReleaseDate), equals(this$.DataMap, other.DataMap), (a = this$.Publications, (b = other.Publications, (length(a) === length(b)) && fold((acc, e) => {
             if (acc) {
                 return e;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_1) => equals(item(i_1, a), item(i_1, b)), rangeDouble(0, 1, length(a) - 1))))))), (a_1 = this$.Contacts, (b_1 = other.Contacts, (length(a_1) === length(b_1)) && fold((acc_1, e_1) => {
+        }, true, toList(delay(() => map_1((i_1) => equals(item(i_1, a), item(i_1, b)), rangeDouble(0, 1, length(a) - 1))))))), (a_1 = this$.Contacts, (b_1 = other.Contacts, (length(a_1) === length(b_1)) && fold((acc_1, e_1) => {
             if (acc_1) {
                 return e_1;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_2) => equals(item(i_2, a_1), item(i_2, b_1)), rangeDouble(0, 1, length(a_1) - 1))))))), (a_2 = this$.StudyDesignDescriptors, (b_2 = other.StudyDesignDescriptors, (length(a_2) === length(b_2)) && fold((acc_2, e_2) => {
+        }, true, toList(delay(() => map_1((i_2) => equals(item(i_2, a_1), item(i_2, b_1)), rangeDouble(0, 1, length(a_1) - 1))))))), (a_2 = this$.StudyDesignDescriptors, (b_2 = other.StudyDesignDescriptors, (length(a_2) === length(b_2)) && fold((acc_2, e_2) => {
             if (acc_2) {
                 return e_2;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_3) => equals(item(i_3, a_2), item(i_3, b_2)), rangeDouble(0, 1, length(a_2) - 1))))))), (a_3 = this$.Tables, (b_3 = other.Tables, (length(a_3) === length(b_3)) && fold((acc_3, e_3) => {
+        }, true, toList(delay(() => map_1((i_3) => equals(item(i_3, a_2), item(i_3, b_2)), rangeDouble(0, 1, length(a_2) - 1))))))), (a_3 = this$.Tables, (b_3 = other.Tables, (length(a_3) === length(b_3)) && fold((acc_3, e_3) => {
             if (acc_3) {
                 return e_3;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_4) => equals(item(i_4, a_3), item(i_4, b_3)), rangeDouble(0, 1, length(a_3) - 1))))))), (a_4 = this$.RegisteredAssayIdentifiers, (b_4 = other.RegisteredAssayIdentifiers, (length(a_4) === length(b_4)) && fold((acc_4, e_4) => {
+        }, true, toList(delay(() => map_1((i_4) => equals(item(i_4, a_3), item(i_4, b_3)), rangeDouble(0, 1, length(a_3) - 1))))))), (a_4 = this$.RegisteredAssayIdentifiers, (b_4 = other.RegisteredAssayIdentifiers, (length(a_4) === length(b_4)) && fold((acc_4, e_4) => {
             if (acc_4) {
                 return e_4;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_5) => (item(i_5, a_4) === item(i_5, b_4)), rangeDouble(0, 1, length(a_4) - 1))))))), (a_5 = this$.Comments, (b_5 = other.Comments, (length(a_5) === length(b_5)) && fold((acc_5, e_5) => {
+        }, true, toList(delay(() => map_1((i_5) => (item(i_5, a_4) === item(i_5, b_4)), rangeDouble(0, 1, length(a_4) - 1))))))), (a_5 = this$.Comments, (b_5 = other.Comments, (length(a_5) === length(b_5)) && fold((acc_5, e_5) => {
             if (acc_5) {
                 return e_5;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_6) => equals(item(i_6, a_5), item(i_6, b_5)), rangeDouble(0, 1, length(a_5) - 1)))))))]);
+        }, true, toList(delay(() => map_1((i_6) => equals(item(i_6, a_5), item(i_6, b_5)), rangeDouble(0, 1, length(a_5) - 1)))))))]);
     }
     ReferenceEquals(other) {
         const this$ = this;
@@ -1245,7 +1272,7 @@ export class ArcStudy extends ArcTables {
     }
     GetHashCode() {
         const this$ = this;
-        return boxHashArray([this$.Identifier, boxHashOption(this$.Title), boxHashOption(this$.Description), boxHashOption(this$.SubmissionDate), boxHashOption(this$.PublicReleaseDate), boxHashSeq(this$.Publications), boxHashSeq(this$.Contacts), boxHashSeq(this$.StudyDesignDescriptors), boxHashSeq(this$.Tables), boxHashSeq(this$.RegisteredAssayIdentifiers), boxHashSeq(this$.Comments)]) | 0;
+        return boxHashArray([this$.Identifier, boxHashOption(this$.Title), boxHashOption(this$.Description), boxHashOption(this$.SubmissionDate), boxHashOption(this$.PublicReleaseDate), boxHashOption(this$.DataMap), boxHashSeq(this$.Publications), boxHashSeq(this$.Contacts), boxHashSeq(this$.StudyDesignDescriptors), boxHashSeq(this$.Tables), boxHashSeq(this$.RegisteredAssayIdentifiers), boxHashSeq(this$.Comments)]) | 0;
     }
     GetLightHashCode() {
         const this$ = this;
@@ -1257,8 +1284,8 @@ export function ArcStudy_$reflection() {
     return class_type("ARCtrl.ArcStudy", void 0, ArcStudy, ArcTables_$reflection());
 }
 
-export function ArcStudy_$ctor_Z187CCF3B(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, registeredAssayIdentifiers, comments) {
-    return new ArcStudy(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, registeredAssayIdentifiers, comments);
+export function ArcStudy_$ctor_64321D5B(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, datamap, registeredAssayIdentifiers, comments) {
+    return new ArcStudy(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, datamap, registeredAssayIdentifiers, comments);
 }
 
 export class ArcInvestigation {
@@ -1297,125 +1324,125 @@ export class ArcInvestigation {
         const registeredStudyIdentifiers_1 = defaultArg(registeredStudyIdentifiers, []);
         const comments_1 = defaultArg(comments, []);
         const remarks_1 = defaultArg(remarks, []);
-        this["identifier@1089"] = identifier;
-        this["title@1090"] = title;
-        this["description@1091"] = description;
-        this["submissionDate@1092"] = submissionDate;
-        this["publicReleaseDate@1093"] = publicReleaseDate;
-        this["ontologySourceReferences@1094-1"] = ontologySourceReferences_1;
-        this["publications@1095-1"] = publications_1;
-        this["contacts@1096-1"] = contacts_1;
-        this["assays@1097-1"] = assays_1;
-        this["studies@1098-1"] = studies_1;
-        this["registeredStudyIdentifiers@1099-1"] = registeredStudyIdentifiers_1;
-        this["comments@1100-1"] = comments_1;
-        this["remarks@1101-1"] = remarks_1;
+        this["identifier@1118"] = identifier;
+        this["title@1119"] = title;
+        this["description@1120"] = description;
+        this["submissionDate@1121"] = submissionDate;
+        this["publicReleaseDate@1122"] = publicReleaseDate;
+        this["ontologySourceReferences@1123-1"] = ontologySourceReferences_1;
+        this["publications@1124-1"] = publications_1;
+        this["contacts@1125-1"] = contacts_1;
+        this["assays@1126-1"] = assays_1;
+        this["studies@1127-1"] = studies_1;
+        this["registeredStudyIdentifiers@1128-1"] = registeredStudyIdentifiers_1;
+        this["comments@1129-1"] = comments_1;
+        this["remarks@1130-1"] = remarks_1;
         this.staticHash = 0;
-        this["init@1070"] = 1;
+        this["init@1099"] = 1;
     }
     get Identifier() {
         const this$ = this;
-        return this$["identifier@1089"];
+        return this$["identifier@1118"];
     }
     set Identifier(i) {
         const this$ = this;
-        this$["identifier@1089"] = i;
+        this$["identifier@1118"] = i;
     }
     get Title() {
         const this$ = this;
-        return unwrap(this$["title@1090"]);
+        return unwrap(this$["title@1119"]);
     }
     set Title(n) {
         const this$ = this;
-        this$["title@1090"] = n;
+        this$["title@1119"] = n;
     }
     get Description() {
         const this$ = this;
-        return unwrap(this$["description@1091"]);
+        return unwrap(this$["description@1120"]);
     }
     set Description(n) {
         const this$ = this;
-        this$["description@1091"] = n;
+        this$["description@1120"] = n;
     }
     get SubmissionDate() {
         const this$ = this;
-        return unwrap(this$["submissionDate@1092"]);
+        return unwrap(this$["submissionDate@1121"]);
     }
     set SubmissionDate(n) {
         const this$ = this;
-        this$["submissionDate@1092"] = n;
+        this$["submissionDate@1121"] = n;
     }
     get PublicReleaseDate() {
         const this$ = this;
-        return unwrap(this$["publicReleaseDate@1093"]);
+        return unwrap(this$["publicReleaseDate@1122"]);
     }
     set PublicReleaseDate(n) {
         const this$ = this;
-        this$["publicReleaseDate@1093"] = n;
+        this$["publicReleaseDate@1122"] = n;
     }
     get OntologySourceReferences() {
         const this$ = this;
-        return this$["ontologySourceReferences@1094-1"];
+        return this$["ontologySourceReferences@1123-1"];
     }
     set OntologySourceReferences(n) {
         const this$ = this;
-        this$["ontologySourceReferences@1094-1"] = n;
+        this$["ontologySourceReferences@1123-1"] = n;
     }
     get Publications() {
         const this$ = this;
-        return this$["publications@1095-1"];
+        return this$["publications@1124-1"];
     }
     set Publications(n) {
         const this$ = this;
-        this$["publications@1095-1"] = n;
+        this$["publications@1124-1"] = n;
     }
     get Contacts() {
         const this$ = this;
-        return this$["contacts@1096-1"];
+        return this$["contacts@1125-1"];
     }
     set Contacts(n) {
         const this$ = this;
-        this$["contacts@1096-1"] = n;
+        this$["contacts@1125-1"] = n;
     }
     get Assays() {
         const this$ = this;
-        return this$["assays@1097-1"];
+        return this$["assays@1126-1"];
     }
     set Assays(n) {
         const this$ = this;
-        this$["assays@1097-1"] = n;
+        this$["assays@1126-1"] = n;
     }
     get Studies() {
         const this$ = this;
-        return this$["studies@1098-1"];
+        return this$["studies@1127-1"];
     }
     set Studies(n) {
         const this$ = this;
-        this$["studies@1098-1"] = n;
+        this$["studies@1127-1"] = n;
     }
     get RegisteredStudyIdentifiers() {
         const this$ = this;
-        return this$["registeredStudyIdentifiers@1099-1"];
+        return this$["registeredStudyIdentifiers@1128-1"];
     }
     set RegisteredStudyIdentifiers(n) {
         const this$ = this;
-        this$["registeredStudyIdentifiers@1099-1"] = n;
+        this$["registeredStudyIdentifiers@1128-1"] = n;
     }
     get Comments() {
         const this$ = this;
-        return this$["comments@1100-1"];
+        return this$["comments@1129-1"];
     }
     set Comments(n) {
         const this$ = this;
-        this$["comments@1100-1"] = n;
+        this$["comments@1129-1"] = n;
     }
     get Remarks() {
         const this$ = this;
-        return this$["remarks@1101-1"];
+        return this$["remarks@1130-1"];
     }
     set Remarks(n) {
         const this$ = this;
-        this$["remarks@1101-1"] = n;
+        this$["remarks@1130-1"] = n;
     }
     get StaticHash() {
         const this$ = this;
@@ -1443,7 +1470,7 @@ export class ArcInvestigation {
     }
     get AssayIdentifiers() {
         const this$ = this;
-        return Array.from(map((x) => x.Identifier, this$.Assays));
+        return Array.from(map_1((x) => x.Identifier, this$.Assays));
     }
     get UnregisteredAssays() {
         const this$ = this;
@@ -1452,7 +1479,7 @@ export class ArcInvestigation {
     AddAssay(assay, registerIn) {
         const this$ = this;
         const assayIdent = assay.Identifier;
-        const matchValue = tryFindIndex((x_1) => (x_1 === assayIdent), map((x) => x.Identifier, this$.Assays));
+        const matchValue = tryFindIndex((x_1) => (x_1 === assayIdent), map_1((x) => x.Identifier, this$.Assays));
         if (matchValue == null) {
         }
         else {
@@ -1552,7 +1579,7 @@ export class ArcInvestigation {
     SetAssayAt(index, assay) {
         const this$ = this;
         const assayIdent = assay.Identifier;
-        const matchValue = tryFindIndex((x) => (x === assayIdent), map((a) => a.Identifier, removeAt(index, this$.Assays)));
+        const matchValue = tryFindIndex((x) => (x === assayIdent), map_1((a) => a.Identifier, removeAt(index, this$.Assays)));
         if (matchValue == null) {
         }
         else {
@@ -1657,7 +1684,7 @@ export class ArcInvestigation {
     }
     get StudyIdentifiers() {
         const this$ = this;
-        return toArray(map((x) => x.Identifier, this$.Studies));
+        return toArray(map_1((x) => x.Identifier, this$.Studies));
     }
     get UnregisteredStudies() {
         const this$ = this;
@@ -1871,7 +1898,7 @@ export class ArcInvestigation {
     RegisterAssayAt(studyIndex, assayIdentifier) {
         const this$ = this;
         const study = this$.GetStudyAt(studyIndex);
-        const matchValue = tryFind((x) => (x === assayIdentifier), map((a) => a.Identifier, this$.Assays));
+        const matchValue = tryFind((x) => (x === assayIdentifier), map_1((a) => a.Identifier, this$.Assays));
         if (matchValue != null) {
         }
         else {
@@ -2097,56 +2124,56 @@ export class ArcInvestigation {
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_1) => equals(item(i_1, a), item(i_1, b)), rangeDouble(0, 1, length(a) - 1))))))), (a_1 = this$.Contacts, (b_1 = other.Contacts, (length(a_1) === length(b_1)) && fold((acc_1, e_1) => {
+        }, true, toList(delay(() => map_1((i_1) => equals(item(i_1, a), item(i_1, b)), rangeDouble(0, 1, length(a) - 1))))))), (a_1 = this$.Contacts, (b_1 = other.Contacts, (length(a_1) === length(b_1)) && fold((acc_1, e_1) => {
             if (acc_1) {
                 return e_1;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_2) => equals(item(i_2, a_1), item(i_2, b_1)), rangeDouble(0, 1, length(a_1) - 1))))))), (a_2 = this$.OntologySourceReferences, (b_2 = other.OntologySourceReferences, (length(a_2) === length(b_2)) && fold((acc_2, e_2) => {
+        }, true, toList(delay(() => map_1((i_2) => equals(item(i_2, a_1), item(i_2, b_1)), rangeDouble(0, 1, length(a_1) - 1))))))), (a_2 = this$.OntologySourceReferences, (b_2 = other.OntologySourceReferences, (length(a_2) === length(b_2)) && fold((acc_2, e_2) => {
             if (acc_2) {
                 return e_2;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_3) => equals(item(i_3, a_2), item(i_3, b_2)), rangeDouble(0, 1, length(a_2) - 1))))))), (a_3 = this$.Assays, (b_3 = other.Assays, (length(a_3) === length(b_3)) && fold((acc_3, e_3) => {
+        }, true, toList(delay(() => map_1((i_3) => equals(item(i_3, a_2), item(i_3, b_2)), rangeDouble(0, 1, length(a_2) - 1))))))), (a_3 = this$.Assays, (b_3 = other.Assays, (length(a_3) === length(b_3)) && fold((acc_3, e_3) => {
             if (acc_3) {
                 return e_3;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_4) => equals(item(i_4, a_3), item(i_4, b_3)), rangeDouble(0, 1, length(a_3) - 1))))))), (a_4 = this$.Studies, (b_4 = other.Studies, (length(a_4) === length(b_4)) && fold((acc_4, e_4) => {
+        }, true, toList(delay(() => map_1((i_4) => equals(item(i_4, a_3), item(i_4, b_3)), rangeDouble(0, 1, length(a_3) - 1))))))), (a_4 = this$.Studies, (b_4 = other.Studies, (length(a_4) === length(b_4)) && fold((acc_4, e_4) => {
             if (acc_4) {
                 return e_4;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_5) => equals(item(i_5, a_4), item(i_5, b_4)), rangeDouble(0, 1, length(a_4) - 1))))))), (a_5 = this$.RegisteredStudyIdentifiers, (b_5 = other.RegisteredStudyIdentifiers, (length(a_5) === length(b_5)) && fold((acc_5, e_5) => {
+        }, true, toList(delay(() => map_1((i_5) => equals(item(i_5, a_4), item(i_5, b_4)), rangeDouble(0, 1, length(a_4) - 1))))))), (a_5 = this$.RegisteredStudyIdentifiers, (b_5 = other.RegisteredStudyIdentifiers, (length(a_5) === length(b_5)) && fold((acc_5, e_5) => {
             if (acc_5) {
                 return e_5;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_6) => (item(i_6, a_5) === item(i_6, b_5)), rangeDouble(0, 1, length(a_5) - 1))))))), (a_6 = this$.Comments, (b_6 = other.Comments, (length(a_6) === length(b_6)) && fold((acc_6, e_6) => {
+        }, true, toList(delay(() => map_1((i_6) => (item(i_6, a_5) === item(i_6, b_5)), rangeDouble(0, 1, length(a_5) - 1))))))), (a_6 = this$.Comments, (b_6 = other.Comments, (length(a_6) === length(b_6)) && fold((acc_6, e_6) => {
             if (acc_6) {
                 return e_6;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_7) => equals(item(i_7, a_6), item(i_7, b_6)), rangeDouble(0, 1, length(a_6) - 1))))))), (a_7 = this$.Remarks, (b_7 = other.Remarks, (length(a_7) === length(b_7)) && fold((acc_7, e_7) => {
+        }, true, toList(delay(() => map_1((i_7) => equals(item(i_7, a_6), item(i_7, b_6)), rangeDouble(0, 1, length(a_6) - 1))))))), (a_7 = this$.Remarks, (b_7 = other.Remarks, (length(a_7) === length(b_7)) && fold((acc_7, e_7) => {
             if (acc_7) {
                 return e_7;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map((i_8) => equals(item(i_8, a_7), item(i_8, b_7)), rangeDouble(0, 1, length(a_7) - 1)))))))]);
+        }, true, toList(delay(() => map_1((i_8) => equals(item(i_8, a_7), item(i_8, b_7)), rangeDouble(0, 1, length(a_7) - 1)))))))]);
     }
     ReferenceEquals(other) {
         const this$ = this;
@@ -2167,7 +2194,7 @@ export class ArcInvestigation {
         const arg_10 = this$.RegisteredStudyIdentifiers;
         const arg_11 = this$.Comments;
         const arg_12 = this$.Remarks;
-        return toText(printf("ArcStudy {\r\n    Identifier = %A,\r\n    Title = %A,\r\n    Description = %A,\r\n    SubmissionDate = %A,\r\n    PublicReleaseDate = %A,\r\n    OntologySourceReferences = %A,\r\n    Publications = %A,\r\n    Contacts = %A,\r\n    Assays = %A,\r\n    Studies = %A,\r\n    RegisteredStudyIdentifiers = %A,\r\n    Comments = %A,\r\n    Remarks = %A,\r\n}"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6)(arg_7)(arg_8)(arg_9)(arg_10)(arg_11)(arg_12);
+        return toText(printf("ArcInvestigation {\r\n    Identifier = %A,\r\n    Title = %A,\r\n    Description = %A,\r\n    SubmissionDate = %A,\r\n    PublicReleaseDate = %A,\r\n    OntologySourceReferences = %A,\r\n    Publications = %A,\r\n    Contacts = %A,\r\n    Assays = %A,\r\n    Studies = %A,\r\n    RegisteredStudyIdentifiers = %A,\r\n    Comments = %A,\r\n    Remarks = %A,\r\n}"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6)(arg_7)(arg_8)(arg_9)(arg_10)(arg_11)(arg_12);
     }
     Equals(other) {
         let i;