@nfdi4plants/arctrl 2.0.0-beta.8 → 2.0.0

package/ARC.js

@@ -1,4 +1,4 @@
-import { concat, fold, map, exactlyOne, tryPick, choose } from "./fable_modules/fable-library-js.4.16.0/Array.js";
+import { append as append_1, contains as contains_1, concat, fold, map, exactlyOne, tryPick, choose } from "./fable_modules/fable-library-js.4.16.0/Array.js";
 import { ARCtrl_ArcAssay__ArcAssay_ToUpdateContract, ARCtrl_ArcAssay__ArcAssay_ToCreateContract_6FCE9E49, ARCtrl_ArcAssay__ArcAssay_ToDeleteContract, ARCtrl_ArcAssay__ArcAssay_tryFromReadContract_Static_7570923F } from "./Contract/ArcAssay.js";
 import { ARCtrl_DataMap__DataMap_ToUpdateContractForAssay_Z721C83C5, ARCtrl_DataMap__DataMap_ToCreateContractForAssay_Z721C83C5, ARCtrl_DataMap__DataMap_ToUpdateContractForStudy_Z721C83C5, ARCtrl_DataMap__DataMap_ToCreateContractForStudy_Z721C83C5, ARCtrl_DataMap__DataMap_tryFromReadContractForStudy_Static, ARCtrl_DataMap__DataMap_tryFromReadContractForAssay_Static } from "./Contract/Datamap.js";
 import { ARCtrl_ArcStudy__ArcStudy_ToCreateContract_6FCE9E49, ARCtrl_ArcStudy__ArcStudy_ToUpdateContract, ARCtrl_ArcStudy__ArcStudy_tryFromReadContract_Static_7570923F } from "./Contract/ArcStudy.js";
@@ -15,12 +15,12 @@ import { ofArray } from "./fable_modules/fable-library-js.4.16.0/List.js";
 import { tryISAReadContractFromPath } from "./Contract/ARC.js";
 import { ArcTables } from "./Core/Table/ArcTables.js";
 import { addToDict } from "./fable_modules/fable-library-js.4.16.0/MapUtil.js";
-import { toFsWorkbook } from "./Spreadsheet/ArcInvestigation.js";
+import { ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF } from "./Spreadsheet/ArcInvestigation.js";
 import { ArcInvestigation } from "./Core/ArcTypes.js";
 import { Assay_datamapFileNameFromIdentifier, Assay_fileNameFromIdentifier, Study_datamapFileNameFromIdentifier, Study_fileNameFromIdentifier } from "./Core/Helper/Identifier.js";
 import { ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_Z4CEFA522 } from "./Spreadsheet/ArcStudy.js";
 import { DataMap__get_StaticHash, DataMap__set_StaticHash_Z524259A4 } from "./Core/DataMap.js";
-import { toFsWorkbook as toFsWorkbook_1 } from "./Spreadsheet/DataMap.js";
+import { toFsWorkbook } from "./Spreadsheet/DataMap.js";
 import { ARCtrl_ArcAssay__ArcAssay_toFsWorkbook_Static_Z2508BE4F } from "./Spreadsheet/ArcAssay.js";
 import { Dictionary_tryGet } from "./fable_modules/FsSpreadsheet.6.2.0/Cells/FsCellsCollection.fs.js";
 import { Clone_createCloneContract_5000466F, Init_createAddRemoteContract_Z721C83C5, gitignoreContract, gitattributesContract, Init_createInitContract_6DFDD678 } from "./Contract/Git.js";
@@ -30,6 +30,7 @@ import { fromString } from "./fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.f
 import { encoder, decoder as decoder_1 } from "./Json/ARC.js";
 import { toString } from "./fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
 import { defaultSpaces } from "./Json/Encode.js";
+import { ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_tryFromReadContract_Static_7570923F, ValidationPackagesConfigHelper_ReadContract, ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toDeleteContract_Static_724DAE55, ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toCreateContract_Static_724DAE55, ValidationPackagesConfigHelper_ConfigFilePath } from "./Contract/ValidationPackagesConfig.js";
 import { class_type } from "./fable_modules/fable-library-js.4.16.0/Reflection.js";
 
 export function ARCAux_getArcAssaysFromContracts(contracts) {
@@ -301,11 +302,11 @@ export class ARC {
         const workbooks = new Map([]);
         const matchValue = this$.ISA;
         if (matchValue == null) {
-            addToDict(workbooks, "isa.investigation.xlsx", ["ISA_Investigation", toFsWorkbook(ArcInvestigation.create("MISSING_IDENTIFIER_"))]);
+            addToDict(workbooks, "isa.investigation.xlsx", ["ISA_Investigation", ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF(ArcInvestigation.create("MISSING_IDENTIFIER_"))]);
         }
         else {
             const inv = matchValue;
-            addToDict(workbooks, "isa.investigation.xlsx", ["ISA_Investigation", toFsWorkbook(inv)]);
+            addToDict(workbooks, "isa.investigation.xlsx", ["ISA_Investigation", ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF(inv)]);
             inv.StaticHash = (inv.GetLightHashCode() | 0);
             iterate((s) => {
                 s.StaticHash = (s.GetLightHashCode() | 0);
@@ -313,7 +314,7 @@ export class ARC {
                 if (s.DataMap != null) {
                     const dm = value_2(s.DataMap);
                     DataMap__set_StaticHash_Z524259A4(dm, safeHash(dm));
-                    addToDict(workbooks, Study_datamapFileNameFromIdentifier(s.Identifier), ["ISA_Datamap", toFsWorkbook_1(dm)]);
+                    addToDict(workbooks, Study_datamapFileNameFromIdentifier(s.Identifier), ["ISA_Datamap", toFsWorkbook(dm)]);
                 }
             }, inv.Studies);
             iterate((a) => {
@@ -322,7 +323,7 @@ export class ARC {
                 if (a.DataMap != null) {
                     const dm_1 = value_2(a.DataMap);
                     DataMap__set_StaticHash_Z524259A4(dm_1, safeHash(dm_1));
-                    addToDict(workbooks, Assay_datamapFileNameFromIdentifier(a.Identifier), ["ISA_Datamap", toFsWorkbook_1(dm_1)]);
+                    addToDict(workbooks, Assay_datamapFileNameFromIdentifier(a.Identifier), ["ISA_Datamap", toFsWorkbook(dm_1)]);
                 }
             }, inv.Assays);
         }
@@ -516,11 +517,43 @@ export class ARC {
             throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
         })() : matchValue.fields[0]));
     }
+    ToROCrateJsonString(spaces) {
+        const this$ = this;
+        const value = encoder(value_2(this$._isa));
+        return toString(defaultSpaces(spaces), value);
+    }
     static toROCrateJsonString(spaces) {
-        return (obj) => {
-            const value = encoder(value_2(obj.ISA));
-            return toString(defaultSpaces(spaces), value);
-        };
+        return (obj) => obj.ToROCrateJsonString(unwrap(spaces));
+    }
+    GetValidationPackagesConfigWriteContract(vpc) {
+        const this$ = this;
+        const paths = this$.FileSystem.Tree.ToFilePaths();
+        if (!contains_1(ValidationPackagesConfigHelper_ConfigFilePath, paths, {
+            Equals: (x, y) => (x === y),
+            GetHashCode: stringHash,
+        })) {
+            const filePaths = append_1([ValidationPackagesConfigHelper_ConfigFilePath], paths);
+            this$.SetFilePaths(filePaths);
+        }
+        return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toCreateContract_Static_724DAE55(vpc);
+    }
+    GetValidationPackagesConfigDeleteContract(vpc) {
+        const this$ = this;
+        const paths = this$.FileSystem.Tree.ToFilePaths();
+        if (contains_1(ValidationPackagesConfigHelper_ConfigFilePath, paths, {
+            Equals: (x, y) => (x === y),
+            GetHashCode: stringHash,
+        })) {
+            const filePaths = paths.filter((p) => !(p === ValidationPackagesConfigHelper_ConfigFilePath));
+            this$.SetFilePaths(filePaths);
+        }
+        return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toDeleteContract_Static_724DAE55(vpc);
+    }
+    GetValidationPackagesConfigReadContract() {
+        return ValidationPackagesConfigHelper_ReadContract;
+    }
+    GetValidationPackagesConfigFromReadContract(contract) {
+        return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_tryFromReadContract_Static_7570923F(contract);
     }
 }
 

package/Contract/ArcInvestigation.js

@@ -2,7 +2,7 @@ import { combineMany } from "../FileSystem/Path.js";
 import { item, equalsWith } from "../fable_modules/fable-library-js.4.16.0/Array.js";
 import { defaultOf } from "../fable_modules/fable-library-js.4.16.0/Util.js";
 import { Contract } from "./Contract.js";
-import { fromFsWorkbook, toFsWorkbook } from "../Spreadsheet/ArcInvestigation.js";
+import { ARCtrl_ArcInvestigation__ArcInvestigation_fromFsWorkbook_Static_32154C9D, ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF } from "../Spreadsheet/ArcInvestigation.js";
 
 export function $007CInvestigationPath$007C_$007C(input) {
     let matchResult;
@@ -26,11 +26,11 @@ export function $007CInvestigationPath$007C_$007C(input) {
 }
 
 export function ARCtrl_ArcInvestigation__ArcInvestigation_ToCreateContract(this$) {
-    return Contract.createCreate("isa.investigation.xlsx", "ISA_Investigation", toFsWorkbook(this$));
+    return Contract.createCreate("isa.investigation.xlsx", "ISA_Investigation", ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF(this$));
 }
 
 export function ARCtrl_ArcInvestigation__ArcInvestigation_ToUpdateContract(this$) {
-    return Contract.createUpdate("isa.investigation.xlsx", "ISA_Investigation", toFsWorkbook(this$));
+    return Contract.createUpdate("isa.investigation.xlsx", "ISA_Investigation", ARCtrl_ArcInvestigation__ArcInvestigation_toFsWorkbook_Static_Z720BD3FF(this$));
 }
 
 export function ARCtrl_ArcInvestigation__ArcInvestigation_toCreateContract_Static_Z720BD3FF(inv) {
@@ -67,7 +67,7 @@ export function ARCtrl_ArcInvestigation__ArcInvestigation_tryFromReadContract_St
     }
     switch (matchResult) {
         case 0:
-            return fromFsWorkbook(fsworkbook);
+            return ARCtrl_ArcInvestigation__ArcInvestigation_fromFsWorkbook_Static_32154C9D(fsworkbook);
         default:
             return void 0;
     }

package/Contract/ValidationPackagesConfig.js

@@ -1,10 +1,14 @@
 import { combineMany } from "../FileSystem/Path.js";
+import { Contract } from "./Contract.js";
 import { item, equalsWith } from "../fable_modules/fable-library-js.4.16.0/Array.js";
 import { defaultOf } from "../fable_modules/fable-library-js.4.16.0/Util.js";
-import { Contract } from "./Contract.js";
 import { ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_fromYamlString_Static_Z721C83C5, ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toYamlString_Static_71136F3F } from "../Yaml/ValidationPackagesConfig.js";
 
-export function $007CValidationPackagesYamlPath$007C_$007C(input) {
+export const ValidationPackagesConfigHelper_ConfigFilePath = combineMany([".arc", "validation_packages.yml"]);
+
+export const ValidationPackagesConfigHelper_ReadContract = new Contract("READ", ValidationPackagesConfigHelper_ConfigFilePath, "YAML", void 0);
+
+export function ValidationPackagesConfigExtensions_$007CValidationPackagesYamlPath$007C_$007C(input) {
     let matchResult;
     if (!equalsWith((x, y) => (x === y), input, defaultOf()) && (input.length === 2)) {
         if (item(0, input) === ".arc") {
@@ -30,18 +34,12 @@ export function $007CValidationPackagesYamlPath$007C_$007C(input) {
     }
 }
 
-export const config_file_path = combineMany([".arc", "validation_packages.yml"]);
-
 export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToCreateContract(this$) {
-    return Contract.createCreate(config_file_path, "YAML", ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toYamlString_Static_71136F3F()(this$));
-}
-
-export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToUpdateContract(this$) {
-    return Contract.createUpdate(config_file_path, "YAML", ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toYamlString_Static_71136F3F()(this$));
+    return Contract.createCreate(ValidationPackagesConfigHelper_ConfigFilePath, "YAML", ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toYamlString_Static_71136F3F()(this$));
 }
 
 export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToDeleteContract(this$) {
-    return Contract.createDelete(config_file_path);
+    return Contract.createDelete(ValidationPackagesConfigHelper_ConfigFilePath);
 }
 
 export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toDeleteContract_Static_724DAE55(config) {
@@ -52,19 +50,22 @@ export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPa
     return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToCreateContract(config);
 }
 
-export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_toUpdateContract_Static_724DAE55(config) {
-    return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_ToUpdateContract(config);
-}
-
 export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_tryFromReadContract_Static_7570923F(c) {
-    let matchResult, yaml;
+    let yaml;
+    let matchResult, p_1, yaml_1;
     if (c.Operation === "READ") {
         if (c.DTOType != null) {
             if (c.DTOType === "YAML") {
                 if (c.DTO != null) {
                     if (typeof c.DTO === "string") {
-                        matchResult = 0;
-                        yaml = c.DTO;
+                        if ((yaml = c.DTO, c.Path === ValidationPackagesConfigHelper_ConfigFilePath)) {
+                            matchResult = 0;
+                            p_1 = c.Path;
+                            yaml_1 = c.DTO;
+                        }
+                        else {
+                            matchResult = 1;
+                        }
                     }
                     else {
                         matchResult = 1;
@@ -87,7 +88,7 @@ export function ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPa
     }
     switch (matchResult) {
         case 0:
-            return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_fromYamlString_Static_Z721C83C5(yaml);
+            return ARCtrl_ValidationPackages_ValidationPackagesConfig__ValidationPackagesConfig_fromYamlString_Static_Z721C83C5(yaml_1);
         default:
             return void 0;
     }

package/Core/ArcTypes.js

@@ -7,6 +7,7 @@ import { addRangeInPlace, removeInPlace, contains as contains_1 } from "../fable
 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";
 import { boxHashSeq, boxHashOption, boxHashArray } from "./Helper/HashCodes.js";
+import { checkValidCharacters } from "./Helper/Identifier.js";
 import { ArcTablesAux_applyIOMap, ArcTablesAux_getIOMap, ArcTables_$reflection, ArcTables } from "./Table/ArcTables.js";
 import { class_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { Array_distinct } from "../fable_modules/fable-library-js.4.16.0/Seq2.js";
@@ -15,16 +16,17 @@ import { FSharpRef } from "../fable_modules/fable-library-js.4.16.0/Types.js";
 export class ArcAssay extends ArcTables {
     constructor(identifier, measurementType, technologyType, technologyPlatform, tables, datamap, performers, comments) {
         super(defaultArg(tables, []));
+        let identifier_1;
         const performers_1 = defaultArg(performers, []);
         const comments_1 = defaultArg(comments, []);
-        this["identifier@109"] = identifier;
+        this["identifier@109"] = ((identifier_1 = identifier.trim(), (checkValidCharacters(identifier_1), identifier_1)));
         this.investigation = void 0;
-        this["measurementType@111"] = measurementType;
-        this["technologyType@112"] = technologyType;
-        this["technologyPlatform@113"] = technologyPlatform;
+        this["measurementType@114"] = measurementType;
+        this["technologyType@115"] = technologyType;
+        this["technologyPlatform@116"] = technologyPlatform;
         this.dataMap = datamap;
-        this["performers@115-1"] = performers_1;
-        this["comments@116-1"] = comments_1;
+        this["performers@118-1"] = performers_1;
+        this["comments@119-1"] = comments_1;
         this.staticHash = 0;
     }
     get Identifier() {
@@ -45,27 +47,27 @@ export class ArcAssay extends ArcTables {
     }
     get MeasurementType() {
         const this$ = this;
-        return unwrap(this$["measurementType@111"]);
+        return unwrap(this$["measurementType@114"]);
     }
     set MeasurementType(n) {
         const this$ = this;
-        this$["measurementType@111"] = n;
+        this$["measurementType@114"] = n;
     }
     get TechnologyType() {
         const this$ = this;
-        return unwrap(this$["technologyType@112"]);
+        return unwrap(this$["technologyType@115"]);
     }
     set TechnologyType(n) {
         const this$ = this;
-        this$["technologyType@112"] = n;
+        this$["technologyType@115"] = n;
     }
     get TechnologyPlatform() {
         const this$ = this;
-        return unwrap(this$["technologyPlatform@113"]);
+        return unwrap(this$["technologyPlatform@116"]);
     }
     set TechnologyPlatform(n) {
         const this$ = this;
-        this$["technologyPlatform@113"] = n;
+        this$["technologyPlatform@116"] = n;
     }
     get DataMap() {
         const this$ = this;
@@ -77,19 +79,19 @@ export class ArcAssay extends ArcTables {
     }
     get Performers() {
         const this$ = this;
-        return this$["performers@115-1"];
+        return this$["performers@118-1"];
     }
     set Performers(n) {
         const this$ = this;
-        this$["performers@115-1"] = n;
+        this$["performers@118-1"] = n;
     }
     get Comments() {
         const this$ = this;
-        return this$["comments@116-1"];
+        return this$["comments@119-1"];
     }
     set Comments(n) {
         const this$ = this;
-        this$["comments@116-1"] = n;
+        this$["comments@119-1"] = n;
     }
     get StaticHash() {
         const this$ = this;
@@ -525,7 +527,7 @@ export class ArcAssay extends ArcTables {
         const arg_4 = this$.Tables;
         const arg_5 = this$.Performers;
         const arg_6 = this$.Comments;
-        return toText(printf("ArcAssay({\n    Identifier = \"%s\",\n    MeasurementType = %A,\n    TechnologyType = %A,\n    TechnologyPlatform = %A,\n    Tables = %A,\n    Performers = %A,\n    Comments = %A\n})"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6);
+        return toText(printf("ArcAssay({\r\n    Identifier = \"%s\",\r\n    MeasurementType = %A,\r\n    TechnologyType = %A,\r\n    TechnologyPlatform = %A,\r\n    Tables = %A,\r\n    Performers = %A,\r\n    Comments = %A\r\n})"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6);
     }
     AddToInvestigation(investigation) {
         const this$ = this;
@@ -614,32 +616,33 @@ export function ArcAssay_$ctor_Z4900C8CC(identifier, measurementType, technology
 export class ArcStudy extends ArcTables {
     constructor(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, datamap, registeredAssayIdentifiers, comments) {
         super(defaultArg(tables, []));
+        let identifier_1;
         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@533"] = identifier;
+        this["identifier@536"] = ((identifier_1 = identifier.trim(), (checkValidCharacters(identifier_1), identifier_1)));
         this.investigation = void 0;
-        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["title@541"] = title;
+        this["description@542"] = description;
+        this["submissionDate@543"] = submissionDate;
+        this["publicReleaseDate@544"] = publicReleaseDate;
+        this["publications@545-1"] = publications_1;
+        this["contacts@546-1"] = contacts_1;
+        this["studyDesignDescriptors@547-1"] = studyDesignDescriptors_1;
+        this["datamap@548"] = datamap;
+        this["registeredAssayIdentifiers@549-1"] = registeredAssayIdentifiers_1;
+        this["comments@550-1"] = comments_1;
         this.staticHash = 0;
     }
     get Identifier() {
         const this$ = this;
-        return this$["identifier@533"];
+        return this$["identifier@536"];
     }
     set Identifier(i) {
         const this$ = this;
-        this$["identifier@533"] = i;
+        this$["identifier@536"] = i;
     }
     get Investigation() {
         const this$ = this;
@@ -651,83 +654,83 @@ export class ArcStudy extends ArcTables {
     }
     get Title() {
         const this$ = this;
-        return unwrap(this$["title@535"]);
+        return unwrap(this$["title@541"]);
     }
     set Title(n) {
         const this$ = this;
-        this$["title@535"] = n;
+        this$["title@541"] = n;
     }
     get Description() {
         const this$ = this;
-        return unwrap(this$["description@536"]);
+        return unwrap(this$["description@542"]);
     }
     set Description(n) {
         const this$ = this;
-        this$["description@536"] = n;
+        this$["description@542"] = n;
     }
     get SubmissionDate() {
         const this$ = this;
-        return unwrap(this$["submissionDate@537"]);
+        return unwrap(this$["submissionDate@543"]);
     }
     set SubmissionDate(n) {
         const this$ = this;
-        this$["submissionDate@537"] = n;
+        this$["submissionDate@543"] = n;
     }
     get PublicReleaseDate() {
         const this$ = this;
-        return unwrap(this$["publicReleaseDate@538"]);
+        return unwrap(this$["publicReleaseDate@544"]);
     }
     set PublicReleaseDate(n) {
         const this$ = this;
-        this$["publicReleaseDate@538"] = n;
+        this$["publicReleaseDate@544"] = n;
     }
     get Publications() {
         const this$ = this;
-        return this$["publications@539-1"];
+        return this$["publications@545-1"];
     }
     set Publications(n) {
         const this$ = this;
-        this$["publications@539-1"] = n;
+        this$["publications@545-1"] = n;
     }
     get Contacts() {
         const this$ = this;
-        return this$["contacts@540-1"];
+        return this$["contacts@546-1"];
     }
     set Contacts(n) {
         const this$ = this;
-        this$["contacts@540-1"] = n;
+        this$["contacts@546-1"] = n;
     }
     get StudyDesignDescriptors() {
         const this$ = this;
-        return this$["studyDesignDescriptors@541-1"];
+        return this$["studyDesignDescriptors@547-1"];
     }
     set StudyDesignDescriptors(n) {
         const this$ = this;
-        this$["studyDesignDescriptors@541-1"] = n;
+        this$["studyDesignDescriptors@547-1"] = n;
     }
     get DataMap() {
         const this$ = this;
-        return unwrap(this$["datamap@542"]);
+        return unwrap(this$["datamap@548"]);
     }
     set DataMap(n) {
         const this$ = this;
-        this$["datamap@542"] = n;
+        this$["datamap@548"] = n;
     }
     get RegisteredAssayIdentifiers() {
         const this$ = this;
-        return this$["registeredAssayIdentifiers@543-1"];
+        return this$["registeredAssayIdentifiers@549-1"];
     }
     set RegisteredAssayIdentifiers(n) {
         const this$ = this;
-        this$["registeredAssayIdentifiers@543-1"] = n;
+        this$["registeredAssayIdentifiers@549-1"] = n;
     }
     get Comments() {
         const this$ = this;
-        return this$["comments@544-1"];
+        return this$["comments@550-1"];
     }
     set Comments(n) {
         const this$ = this;
-        this$["comments@544-1"] = n;
+        this$["comments@550-1"] = n;
     }
     get StaticHash() {
         const this$ = this;
@@ -1263,7 +1266,7 @@ export class ArcStudy extends ArcTables {
         const arg_8 = this$.Tables;
         const arg_9 = this$.RegisteredAssayIdentifiers;
         const arg_10 = this$.Comments;
-        return toText(printf("ArcStudy {\n    Identifier = %A,\n    Title = %A,\n    Description = %A,\n    SubmissionDate = %A,\n    PublicReleaseDate = %A,\n    Publications = %A,\n    Contacts = %A,\n    StudyDesignDescriptors = %A,\n    Tables = %A,\n    RegisteredAssayIdentifiers = %A,\n    Comments = %A,\n}"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6)(arg_7)(arg_8)(arg_9)(arg_10);
+        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    Publications = %A,\r\n    Contacts = %A,\r\n    StudyDesignDescriptors = %A,\r\n    Tables = %A,\r\n    RegisteredAssayIdentifiers = %A,\r\n    Comments = %A,\r\n}"))(arg)(arg_1)(arg_2)(arg_3)(arg_4)(arg_5)(arg_6)(arg_7)(arg_8)(arg_9)(arg_10);
     }
     Equals(other) {
         let s;
@@ -1324,125 +1327,125 @@ export class ArcInvestigation {
         const registeredStudyIdentifiers_1 = defaultArg(registeredStudyIdentifiers, []);
         const comments_1 = defaultArg(comments, []);
         const remarks_1 = defaultArg(remarks, []);
-        this["identifier@1119"] = identifier;
-        this["title@1120"] = title;
-        this["description@1121"] = description;
-        this["submissionDate@1122"] = submissionDate;
-        this["publicReleaseDate@1123"] = publicReleaseDate;
-        this["ontologySourceReferences@1124-1"] = ontologySourceReferences_1;
-        this["publications@1125-1"] = publications_1;
-        this["contacts@1126-1"] = contacts_1;
-        this["assays@1127-1"] = assays_1;
-        this["studies@1128-1"] = studies_1;
-        this["registeredStudyIdentifiers@1129-1"] = registeredStudyIdentifiers_1;
-        this["comments@1130-1"] = comments_1;
-        this["remarks@1131-1"] = remarks_1;
+        this["identifier@1125"] = identifier;
+        this["title@1126"] = title;
+        this["description@1127"] = description;
+        this["submissionDate@1128"] = submissionDate;
+        this["publicReleaseDate@1129"] = publicReleaseDate;
+        this["ontologySourceReferences@1130-1"] = ontologySourceReferences_1;
+        this["publications@1131-1"] = publications_1;
+        this["contacts@1132-1"] = contacts_1;
+        this["assays@1133-1"] = assays_1;
+        this["studies@1134-1"] = studies_1;
+        this["registeredStudyIdentifiers@1135-1"] = registeredStudyIdentifiers_1;
+        this["comments@1136-1"] = comments_1;
+        this["remarks@1137-1"] = remarks_1;
         this.staticHash = 0;
-        this["init@1100"] = 1;
+        this["init@1106"] = 1;
     }
     get Identifier() {
         const this$ = this;
-        return this$["identifier@1119"];
+        return this$["identifier@1125"];
     }
     set Identifier(i) {
         const this$ = this;
-        this$["identifier@1119"] = i;
+        this$["identifier@1125"] = i;
     }
     get Title() {
         const this$ = this;
-        return unwrap(this$["title@1120"]);
+        return unwrap(this$["title@1126"]);
     }
     set Title(n) {
         const this$ = this;
-        this$["title@1120"] = n;
+        this$["title@1126"] = n;
     }
     get Description() {
         const this$ = this;
-        return unwrap(this$["description@1121"]);
+        return unwrap(this$["description@1127"]);
     }
     set Description(n) {
         const this$ = this;
-        this$["description@1121"] = n;
+        this$["description@1127"] = n;
     }
     get SubmissionDate() {
         const this$ = this;
-        return unwrap(this$["submissionDate@1122"]);
+        return unwrap(this$["submissionDate@1128"]);
     }
     set SubmissionDate(n) {
         const this$ = this;
-        this$["submissionDate@1122"] = n;
+        this$["submissionDate@1128"] = n;
     }
     get PublicReleaseDate() {
         const this$ = this;
-        return unwrap(this$["publicReleaseDate@1123"]);
+        return unwrap(this$["publicReleaseDate@1129"]);
     }
     set PublicReleaseDate(n) {
         const this$ = this;
-        this$["publicReleaseDate@1123"] = n;
+        this$["publicReleaseDate@1129"] = n;
     }
     get OntologySourceReferences() {
         const this$ = this;
-        return this$["ontologySourceReferences@1124-1"];
+        return this$["ontologySourceReferences@1130-1"];
     }
     set OntologySourceReferences(n) {
         const this$ = this;
-        this$["ontologySourceReferences@1124-1"] = n;
+        this$["ontologySourceReferences@1130-1"] = n;
     }
     get Publications() {
         const this$ = this;
-        return this$["publications@1125-1"];
+        return this$["publications@1131-1"];
     }
     set Publications(n) {
         const this$ = this;
-        this$["publications@1125-1"] = n;
+        this$["publications@1131-1"] = n;
     }
     get Contacts() {
         const this$ = this;
-        return this$["contacts@1126-1"];
+        return this$["contacts@1132-1"];
     }
     set Contacts(n) {
         const this$ = this;
-        this$["contacts@1126-1"] = n;
+        this$["contacts@1132-1"] = n;
     }
     get Assays() {
         const this$ = this;
-        return this$["assays@1127-1"];
+        return this$["assays@1133-1"];
     }
     set Assays(n) {
         const this$ = this;
-        this$["assays@1127-1"] = n;
+        this$["assays@1133-1"] = n;
     }
     get Studies() {
         const this$ = this;
-        return this$["studies@1128-1"];
+        return this$["studies@1134-1"];
     }
     set Studies(n) {
         const this$ = this;
-        this$["studies@1128-1"] = n;
+        this$["studies@1134-1"] = n;
     }
     get RegisteredStudyIdentifiers() {
         const this$ = this;
-        return this$["registeredStudyIdentifiers@1129-1"];
+        return this$["registeredStudyIdentifiers@1135-1"];
     }
     set RegisteredStudyIdentifiers(n) {
         const this$ = this;
-        this$["registeredStudyIdentifiers@1129-1"] = n;
+        this$["registeredStudyIdentifiers@1135-1"] = n;
     }
     get Comments() {
         const this$ = this;
-        return this$["comments@1130-1"];
+        return this$["comments@1136-1"];
     }
     set Comments(n) {
         const this$ = this;
-        this$["comments@1130-1"] = n;
+        this$["comments@1136-1"] = n;
     }
     get Remarks() {
         const this$ = this;
-        return this$["remarks@1131-1"];
+        return this$["remarks@1137-1"];
     }
     set Remarks(n) {
         const this$ = this;
-        this$["remarks@1131-1"] = n;
+        this$["remarks@1137-1"] = n;
     }
     get StaticHash() {
         const this$ = this;
@@ -2236,7 +2239,7 @@ export class ArcInvestigation {
         const arg_10 = this$.RegisteredStudyIdentifiers;
         const arg_11 = this$.Comments;
         const arg_12 = this$.Remarks;
-        return toText(printf("ArcInvestigation {\n    Identifier = %A,\n    Title = %A,\n    Description = %A,\n    SubmissionDate = %A,\n    PublicReleaseDate = %A,\n    OntologySourceReferences = %A,\n    Publications = %A,\n    Contacts = %A,\n    Assays = %A,\n    Studies = %A,\n    RegisteredStudyIdentifiers = %A,\n    Comments = %A,\n    Remarks = %A,\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;