@nfdi4plants/arctrl 1.0.0-alpha9 → 1.0.0-beta.2

package/ISA/ISA/ArcTypes/ArcTypes.js

@@ -1,48 +1,47 @@
-import { map as map_1, defaultArg, unwrap } from "../../../fable_modules/fable-library.4.1.4/Option.js";
-import { ArcTablesAux_applyIOMap, ArcTablesAux_getIOMap, ArcTables_updateReferenceTablesBySheets_Z2EE88E97, ArcTables_fromProcesses_134EBDED, ArcTables__get_Tables, ArcTables__GetProcesses, ArcTables__GetRow_Z18115A39, ArcTables__GetRowAt_Z37302880, ArcTables__UpdateRow_1BFE2CFB, ArcTables__UpdateRowAt_1CF7B5DC, ArcTables__RemoveRow_Z18115A39, ArcTables__RemoveRowAt_Z37302880, ArcTables__AddRow_Z16315DE5, ArcTables__AddRowAt_Z12CDB784, ArcTables__GetColumn_Z18115A39, ArcTables__GetColumnAt_Z37302880, ArcTables__UpdateColumn_Z6083042A, ArcTables__UpdateColumnAt_21300791, ArcTables__RemoveColumn_Z18115A39, ArcTables__RemoveColumnAt_Z37302880, ArcTables__AddColumn_1FF50D3C, ArcTables__AddColumnAt_6A9784DB, ArcTables__RenameTable_Z384F8060, ArcTables__RenameTableAt_Z176EF219, ArcTables__MapTable_27DD7B1B, ArcTables__MapTableAt_8FC095C, ArcTables__RemoveTable_Z721C83C5, ArcTables__RemoveTableAt_Z524259A4, ArcTables__SetTable_51766571, ArcTables__SetTableAt_7E571736, ArcTables__UpdateTable_51766571, ArcTables__UpdateTableAt_7E571736, ArcTables__GetTable_Z721C83C5, ArcTables__GetTableAt_Z524259A4, ArcTables__InitTables_7B28792B, ArcTables__InitTable_3B406CA4, ArcTables__AddTables_Z2D453886, ArcTables__AddTable_EC12B15, ArcTables__get_TableNames, ArcTables_$ctor_Z18C2F36D, ArcTables__get_Count } from "./ArcTables.js";
-import { concat, collect, append as append_4, tryFind, removeAt, tryFindIndex, item, map as map_2, delay, toList, fold, length, forAll, contains, filter, toArray } from "../../../fable_modules/fable-library.4.1.4/Seq.js";
-import { defaultOf, safeHash, equals, disposeSafe, getEnumerator, stringHash } from "../../../fable_modules/fable-library.4.1.4/Util.js";
-import { addRangeInPlace, tryFind as tryFind_1, removeInPlace, equalsWith, append as append_3, contains as contains_1, map } from "../../../fable_modules/fable-library.4.1.4/Array.js";
-import { distinctBy, Array_distinct } from "../../../fable_modules/fable-library.4.1.4/Seq2.js";
-import { printf, toText } from "../../../fable_modules/fable-library.4.1.4/String.js";
-import { create, match } from "../../../fable_modules/fable-library.4.1.4/RegExp.js";
+import { map as map_1, defaultArg, unwrap } from "../../../fable_modules/fable-library.4.4.1/Option.js";
+import { concat, collect, append as append_4, tryFind, removeAt, tryFindIndex, item as item_1, map as map_2, delay, toList, fold, length, forAll, contains, filter, toArray } from "../../../fable_modules/fable-library.4.4.1/Seq.js";
+import { defaultOf, safeHash, equals, disposeSafe, getEnumerator, stringHash } from "../../../fable_modules/fable-library.4.4.1/Util.js";
+import { addRangeInPlace, tryFind as tryFind_1, removeInPlace, equalsWith, append as append_3, contains as contains_1, map } from "../../../fable_modules/fable-library.4.4.1/Array.js";
+import { distinctBy, Array_distinct } from "../../../fable_modules/fable-library.4.4.1/Seq2.js";
+import { printf, toText } from "../../../fable_modules/fable-library.4.4.1/String.js";
+import { create, match } from "../../../fable_modules/fable-library.4.4.1/RegExp.js";
 import { OntologyAnnotation } from "../JsonTypes/OntologyAnnotation.js";
 import { Value_fromString_Z721C83C5, Value__get_Text } from "../JsonTypes/Value.js";
 import { AnnotationValue } from "../JsonTypes/AnnotationValue.js";
+import { ArcTablesAux_applyIOMap, ArcTablesAux_getIOMap, ArcTables_$reflection, ArcTables } from "./ArcTables.js";
 import { AssayMaterials_get_empty, AssayMaterials_create_Z253F0553 } from "../JsonTypes/AssayMaterials.js";
 import { HashCodes_boxHashOption, HashCodes_boxHashArray, Option_fromValueWithDefault } from "../Helper.js";
-import { unzip, ofSeq, map as map_3, toArray as toArray_1, ofArray, empty } from "../../../fable_modules/fable-library.4.1.4/List.js";
+import { unzip, ofSeq, map as map_3, toArray as toArray_1, ofArray, empty } from "../../../fable_modules/fable-library.4.4.1/List.js";
 import { getSources, getProtocols, getUnits, getCharacteristics, getData, getMaterials, getSamples } from "../JsonTypes/ProcessSequence.js";
 import { Assay_create_3D372A24 } from "../JsonTypes/Assay.js";
 import { Study_identifierFromFileName, Study_fileNameFromIdentifier, Assay_identifierFromFileName, createMissingIdentifier, Assay_fileNameFromIdentifier, isMissingIdentifier } from "../Identifier.js";
-import { rangeDouble } from "../../../fable_modules/fable-library.4.1.4/Range.js";
-import { class_type } from "../../../fable_modules/fable-library.4.1.4/Reflection.js";
+import { rangeDouble } from "../../../fable_modules/fable-library.4.4.1/Range.js";
+import { class_type } from "../../../fable_modules/fable-library.4.4.1/Reflection.js";
 import { StudyMaterials_get_empty, StudyMaterials_create_1BE9FA55 } from "../JsonTypes/StudyMaterials.js";
 import { Study_create_Z2D28E954 } from "../JsonTypes/Study.js";
 import { Investigation_create_4AD66BBE } from "../JsonTypes/Investigation.js";
-import { FSharpRef } from "../../../fable_modules/fable-library.4.1.4/Types.js";
+import { FSharpRef } from "../../../fable_modules/fable-library.4.4.1/Types.js";
 
-export class ArcAssay {
+export class ArcAssay extends ArcTables {
     constructor(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments) {
-        const tables_1 = defaultArg(tables, []);
+        super(defaultArg(tables, []));
         const performers_1 = defaultArg(performers, []);
         const comments_1 = defaultArg(comments, []);
-        this["identifier@86"] = identifier;
+        this["identifier@87"] = identifier;
         this.investigation = void 0;
         this["MeasurementType@"] = measurementType;
         this["TechnologyType@"] = technologyType;
         this["TechnologyPlatform@"] = technologyPlatform;
-        this["Tables@"] = tables_1;
         this["Performers@"] = performers_1;
         this["Comments@"] = comments_1;
     }
     get Identifier() {
         const this$ = this;
-        return this$["identifier@86"];
+        return this$["identifier@87"];
     }
     set Identifier(i) {
         const this$ = this;
-        this$["identifier@86"] = i;
+        this$["identifier@87"] = i;
     }
     get Investigation() {
         const this$ = this;
@@ -79,14 +78,6 @@ export class ArcAssay {
         const __ = this;
         __["TechnologyPlatform@"] = v;
     }
-    get Tables() {
-        const __ = this;
-        return __["Tables@"];
-    }
-    set Tables(v) {
-        const __ = this;
-        __["Tables@"] = v;
-    }
     get Performers() {
         const __ = this;
         return __["Performers@"];
@@ -112,14 +103,6 @@ export class ArcAssay {
     static make(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments) {
         return new ArcAssay(identifier, unwrap(measurementType), unwrap(technologyType), unwrap(technologyPlatform), tables, performers, comments);
     }
-    get TableCount() {
-        const this$ = this;
-        return ArcTables__get_Count(ArcTables_$ctor_Z18C2F36D(this$.Tables)) | 0;
-    }
-    get TableNames() {
-        const this$ = this;
-        return ArcTables__get_TableNames(ArcTables_$ctor_Z18C2F36D(this$.Tables));
-    }
     get StudiesRegisteredIn() {
         const this$ = this;
         const matchValue = this$.Investigation;
@@ -137,10 +120,6 @@ export class ArcAssay {
             }, i.Studies));
         }
     }
-    AddTable(table, index) {
-        const this$ = this;
-        ArcTables__AddTable_EC12B15(ArcTables_$ctor_Z18C2F36D(this$.Tables), table, unwrap(index));
-    }
     static addTable(table, index) {
         return (assay) => {
             const c = assay.Copy();
@@ -148,10 +127,6 @@ export class ArcAssay {
             return c;
         };
     }
-    AddTables(tables, index) {
-        const this$ = this;
-        ArcTables__AddTables_Z2D453886(ArcTables_$ctor_Z18C2F36D(this$.Tables), tables, unwrap(index));
-    }
     static addTables(tables, index) {
         return (assay) => {
             const c = assay.Copy();
@@ -159,20 +134,12 @@ export class ArcAssay {
             return c;
         };
     }
-    InitTable(tableName, index) {
-        const this$ = this;
-        return ArcTables__InitTable_3B406CA4(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, unwrap(index));
-    }
     static initTable(tableName, index) {
         return (assay) => {
             const c = assay.Copy();
             return [c, c.InitTable(tableName, unwrap(index))];
         };
     }
-    InitTables(tableNames, index) {
-        const this$ = this;
-        ArcTables__InitTables_7B28792B(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableNames, unwrap(index));
-    }
     static initTables(tableNames, index) {
         return (assay) => {
             const c = assay.Copy();
@@ -180,30 +147,18 @@ export class ArcAssay {
             return c;
         };
     }
-    GetTableAt(index) {
-        const this$ = this;
-        return ArcTables__GetTableAt_Z524259A4(ArcTables_$ctor_Z18C2F36D(this$.Tables), index);
-    }
     static getTableAt(index) {
         return (assay) => {
             const newAssay = assay.Copy();
             return newAssay.GetTableAt(index);
         };
     }
-    GetTable(name) {
-        const this$ = this;
-        return ArcTables__GetTable_Z721C83C5(ArcTables_$ctor_Z18C2F36D(this$.Tables), name);
-    }
     static getTable(name) {
         return (assay) => {
             const newAssay = assay.Copy();
             return newAssay.GetTable(name);
         };
     }
-    UpdateTableAt(index, table) {
-        const this$ = this;
-        ArcTables__UpdateTableAt_7E571736(ArcTables_$ctor_Z18C2F36D(this$.Tables), index, table);
-    }
     static updateTableAt(index, table) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -211,10 +166,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    UpdateTable(name, table) {
-        const this$ = this;
-        ArcTables__UpdateTable_51766571(ArcTables_$ctor_Z18C2F36D(this$.Tables), name, table);
-    }
     static updateTable(name, table) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -222,10 +173,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    SetTableAt(index, table) {
-        const this$ = this;
-        ArcTables__SetTableAt_7E571736(ArcTables_$ctor_Z18C2F36D(this$.Tables), index, table);
-    }
     static setTableAt(index, table) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -233,10 +180,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    SetTable(name, table) {
-        const this$ = this;
-        ArcTables__SetTable_51766571(ArcTables_$ctor_Z18C2F36D(this$.Tables), name, table);
-    }
     static setTable(name, table) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -244,10 +187,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    RemoveTableAt(index) {
-        const this$ = this;
-        ArcTables__RemoveTableAt_Z524259A4(ArcTables_$ctor_Z18C2F36D(this$.Tables), index);
-    }
     static removeTableAt(index) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -255,10 +194,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    RemoveTable(name) {
-        const this$ = this;
-        ArcTables__RemoveTable_Z721C83C5(ArcTables_$ctor_Z18C2F36D(this$.Tables), name);
-    }
     static removeTable(name) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -266,10 +201,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    MapTableAt(index, updateFun) {
-        const this$ = this;
-        ArcTables__MapTableAt_8FC095C(ArcTables_$ctor_Z18C2F36D(this$.Tables), index, updateFun);
-    }
     static mapTableAt(index, updateFun) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -277,10 +208,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    MapTable(name, updateFun) {
-        const this$ = this;
-        ArcTables__MapTable_27DD7B1B(ArcTables_$ctor_Z18C2F36D(this$.Tables), name, updateFun);
-    }
     static updateTable(name, updateFun) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -288,10 +215,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    RenameTableAt(index, newName) {
-        const this$ = this;
-        ArcTables__RenameTableAt_Z176EF219(ArcTables_$ctor_Z18C2F36D(this$.Tables), index, newName);
-    }
     static renameTableAt(index, newName) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -299,10 +222,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    RenameTable(name, newName) {
-        const this$ = this;
-        ArcTables__RenameTable_Z384F8060(ArcTables_$ctor_Z18C2F36D(this$.Tables), name, newName);
-    }
     static renameTable(name, newName) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -310,10 +229,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    AddColumnAt(tableIndex, header, cells, columnIndex, forceReplace) {
-        const this$ = this;
-        ArcTables__AddColumnAt_6A9784DB(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, header, unwrap(cells), unwrap(columnIndex), unwrap(forceReplace));
-    }
     static addColumnAt(tableIndex, header, cells, columnIndex, forceReplace) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -321,10 +236,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    AddColumn(tableName, header, cells, columnIndex, forceReplace) {
-        const this$ = this;
-        ArcTables__AddColumn_1FF50D3C(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, header, unwrap(cells), unwrap(columnIndex), unwrap(forceReplace));
-    }
     static addColumn(tableName, header, cells, columnIndex, forceReplace) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -332,10 +243,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    RemoveColumnAt(tableIndex, columnIndex) {
-        const this$ = this;
-        ArcTables__RemoveColumnAt_Z37302880(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, columnIndex);
-    }
     static removeColumnAt(tableIndex, columnIndex) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -343,10 +250,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    RemoveColumn(tableName, columnIndex) {
-        const this$ = this;
-        ArcTables__RemoveColumn_Z18115A39(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, columnIndex);
-    }
     static removeColumn(tableName, columnIndex) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -354,10 +257,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    UpdateColumnAt(tableIndex, columnIndex, header, cells) {
-        const this$ = this;
-        ArcTables__UpdateColumnAt_21300791(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, columnIndex, header, unwrap(cells));
-    }
     static updateColumnAt(tableIndex, columnIndex, header, cells) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -365,10 +264,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    UpdateColumn(tableName, columnIndex, header, cells) {
-        const this$ = this;
-        ArcTables__UpdateColumn_Z6083042A(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, columnIndex, header, unwrap(cells));
-    }
     static updateColumn(tableName, columnIndex, header, cells) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -376,30 +271,18 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    GetColumnAt(tableIndex, columnIndex) {
-        const this$ = this;
-        return ArcTables__GetColumnAt_Z37302880(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, columnIndex);
-    }
     static getColumnAt(tableIndex, columnIndex) {
         return (assay) => {
             const newAssay = assay.Copy();
             return newAssay.GetColumnAt(tableIndex, columnIndex);
         };
     }
-    GetColumn(tableName, columnIndex) {
-        const this$ = this;
-        return ArcTables__GetColumn_Z18115A39(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, columnIndex);
-    }
     static getColumn(tableName, columnIndex) {
         return (assay) => {
             const newAssay = assay.Copy();
             return newAssay.GetColumn(tableName, columnIndex);
         };
     }
-    AddRowAt(tableIndex, cells, rowIndex) {
-        const this$ = this;
-        ArcTables__AddRowAt_Z12CDB784(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, unwrap(cells), unwrap(rowIndex));
-    }
     static addRowAt(tableIndex, cells, rowIndex) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -407,10 +290,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    AddRow(tableName, cells, rowIndex) {
-        const this$ = this;
-        ArcTables__AddRow_Z16315DE5(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, unwrap(cells), unwrap(rowIndex));
-    }
     static addRow(tableName, cells, rowIndex) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -418,10 +297,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    RemoveRowAt(tableIndex, rowIndex) {
-        const this$ = this;
-        ArcTables__RemoveRowAt_Z37302880(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, rowIndex);
-    }
     static removeRowAt(tableIndex, rowIndex) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -429,10 +304,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    RemoveRow(tableName, rowIndex) {
-        const this$ = this;
-        ArcTables__RemoveRow_Z18115A39(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, rowIndex);
-    }
     static removeRow(tableName, rowIndex) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -440,10 +311,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    UpdateRowAt(tableIndex, rowIndex, cells) {
-        const this$ = this;
-        ArcTables__UpdateRowAt_1CF7B5DC(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, rowIndex, cells);
-    }
     static updateRowAt(tableIndex, rowIndex, cells) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -451,10 +318,6 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    UpdateRow(tableName, rowIndex, cells) {
-        const this$ = this;
-        ArcTables__UpdateRow_1BFE2CFB(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, rowIndex, cells);
-    }
     static updateRow(tableName, rowIndex, cells) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -462,20 +325,12 @@ export class ArcAssay {
             return newAssay;
         };
     }
-    GetRowAt(tableIndex, rowIndex) {
-        const this$ = this;
-        return ArcTables__GetRowAt_Z37302880(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, rowIndex);
-    }
     static getRowAt(tableIndex, rowIndex) {
         return (assay) => {
             const newAssay = assay.Copy();
             return newAssay.GetRowAt(tableIndex, rowIndex);
         };
     }
-    GetRow(tableName, rowIndex) {
-        const this$ = this;
-        return ArcTables__GetRow_Z18115A39(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, rowIndex);
-    }
     static getRow(tableName, rowIndex) {
         return (assay) => {
             const newAssay = assay.Copy();
@@ -502,11 +357,11 @@ export class ArcAssay {
         }
         const nextComments = map((c) => c.Copy(), this$.Comments);
         const nextPerformers = map((c_1) => c_1.Copy(), this$.Performers);
-        const arg = this$.Identifier;
-        const arg_1 = this$.MeasurementType;
-        const arg_2 = this$.TechnologyType;
-        const arg_3 = this$.TechnologyPlatform;
-        return ArcAssay.make(arg, arg_1, arg_2, arg_3, nextTables, nextPerformers, nextComments);
+        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);
     }
     UpdateBy(assay, onlyReplaceExisting, appendSequences) {
         const this$ = this;
@@ -589,8 +444,8 @@ export class ArcAssay {
         const r = match(create("(?<value>[^\\(]+) \\((?<ontology>[^(]*:[^)]*)\\)"), name);
         if (r != null) {
             let oa;
-            const arg = (r.groups && r.groups.ontology) || "";
-            oa = OntologyAnnotation.fromTermAnnotation(arg);
+            const termAnnotation = (r.groups && r.groups.ontology) || "";
+            oa = OntologyAnnotation.fromTermAnnotation(termAnnotation);
             return new OntologyAnnotation(oa.ID, new AnnotationValue(0, [Value__get_Text(Value_fromString_Z721C83C5((r.groups && r.groups.value) || ""))]), oa.TermSourceREF, oa.TermAccessionNumber, oa.Comments);
         }
         else {
@@ -629,18 +484,21 @@ export class ArcAssay {
     }
     ToAssay() {
         const this$ = this;
-        const processSeq = ArcTables__GetProcesses(ArcTables_$ctor_Z18C2F36D(this$.Tables));
+        const processSeq = (new ArcTables(this$.Tables)).GetProcesses();
         let assayMaterials;
         const v_2 = AssayMaterials_create_Z253F0553(unwrap(Option_fromValueWithDefault(empty(), getSamples(processSeq))), unwrap(Option_fromValueWithDefault(empty(), getMaterials(processSeq))));
         assayMaterials = Option_fromValueWithDefault(AssayMaterials_get_empty(), v_2);
-        return Assay_create_3D372A24(void 0, unwrap(isMissingIdentifier(this$.Identifier) ? void 0 : Assay_fileNameFromIdentifier(this$.Identifier)), unwrap(this$.MeasurementType), unwrap(this$.TechnologyType), unwrap(map_1((arg) => ArcAssay.composeTechnologyPlatform(arg), this$.TechnologyPlatform)), unwrap(Option_fromValueWithDefault(empty(), getData(processSeq))), unwrap(assayMaterials), unwrap(Option_fromValueWithDefault(empty(), getCharacteristics(processSeq))), unwrap(Option_fromValueWithDefault(empty(), getUnits(processSeq))), unwrap(Option_fromValueWithDefault(empty(), processSeq)), unwrap(Option_fromValueWithDefault(empty(), ofArray(this$.Comments))));
+        return Assay_create_3D372A24(void 0, unwrap(isMissingIdentifier(this$.Identifier) ? void 0 : Assay_fileNameFromIdentifier(this$.Identifier)), unwrap(this$.MeasurementType), unwrap(this$.TechnologyType), unwrap(map_1((tp) => ArcAssay.composeTechnologyPlatform(tp), this$.TechnologyPlatform)), unwrap(Option_fromValueWithDefault(empty(), getData(processSeq))), unwrap(assayMaterials), unwrap(Option_fromValueWithDefault(empty(), getCharacteristics(processSeq))), unwrap(Option_fromValueWithDefault(empty(), getUnits(processSeq))), unwrap(Option_fromValueWithDefault(empty(), processSeq)), unwrap(Option_fromValueWithDefault(empty(), ofArray(this$.Comments))));
     }
     static fromAssay(a) {
-        const tables = map_1((arg_1) => ArcTables__get_Tables(ArcTables_fromProcesses_134EBDED(arg_1)), a.ProcessSequence);
+        const tables = map_1((arg) => {
+            const t = ArcTables.fromProcesses(arg);
+            return t.Tables;
+        }, a.ProcessSequence);
         let identifer;
         const matchValue = a.FileName;
         identifer = ((matchValue == null) ? createMissingIdentifier() : Assay_identifierFromFileName(matchValue));
-        return ArcAssay.create(identifer, unwrap(map_1((x) => x.Copy(), a.MeasurementType)), unwrap(map_1((x_1) => x_1.Copy(), a.TechnologyType)), unwrap(map_1((arg_2) => ArcAssay.decomposeTechnologyPlatform(arg_2), a.TechnologyPlatform)), unwrap(tables), void 0, unwrap(map_1(toArray_1, a.Comments)));
+        return ArcAssay.create(identifer, unwrap(map_1((x) => x.Copy(), a.MeasurementType)), unwrap(map_1((x_1) => x_1.Copy(), a.TechnologyType)), unwrap(map_1((name) => ArcAssay.decomposeTechnologyPlatform(name), a.TechnologyPlatform)), unwrap(tables), void 0, unwrap(map_1(toArray_1, a.Comments)));
     }
     StructurallyEquals(other) {
         let a, b, a_1, b_1, a_2, b_2;
@@ -652,21 +510,21 @@ export class ArcAssay {
             else {
                 return false;
             }
-        }, true, toList(delay(() => map_2((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_2((i_1) => equals(item_1(i_1, a), item_1(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_2((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_2((i_2) => equals(item_1(i_2, a_1), item_1(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_2((i_3) => equals(item(i_3, a_2), item(i_3, b_2)), rangeDouble(0, 1, length(a_2) - 1)))))))]);
+        }, true, toList(delay(() => map_2((i_3) => equals(item_1(i_3, a_2), item_1(i_3, b_2)), rangeDouble(0, 1, length(a_2) - 1)))))))]);
     }
     ReferenceEquals(other) {
         const this$ = this;
@@ -684,23 +542,23 @@ export class ArcAssay {
 }
 
 export function ArcAssay_$reflection() {
-    return class_type("ARCtrl.ISA.ArcAssay", void 0, ArcAssay);
+    return class_type("ARCtrl.ISA.ArcAssay", void 0, ArcAssay, ArcTables_$reflection());
 }
 
 export function ArcAssay_$ctor_Z1126B596(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments) {
     return new ArcAssay(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments);
 }
 
-export class ArcStudy {
+export class ArcStudy extends ArcTables {
     constructor(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, registeredAssayIdentifiers, factors, comments) {
+        super(defaultArg(tables, []));
         const publications_1 = defaultArg(publications, []);
         const contacts_1 = defaultArg(contacts, []);
         const studyDesignDescriptors_1 = defaultArg(studyDesignDescriptors, []);
-        const tables_1 = defaultArg(tables, []);
         const registeredAssayIdentifiers_1 = defaultArg(registeredAssayIdentifiers, []);
         const factors_1 = defaultArg(factors, []);
         const comments_1 = defaultArg(comments, []);
-        this["identifier@653"] = identifier;
+        this["identifier@564"] = identifier;
         this.investigation = void 0;
         this["Title@"] = title;
         this["Description@"] = description;
@@ -709,18 +567,17 @@ export class ArcStudy {
         this["Publications@"] = publications_1;
         this["Contacts@"] = contacts_1;
         this["StudyDesignDescriptors@"] = studyDesignDescriptors_1;
-        this["Tables@"] = tables_1;
         this["RegisteredAssayIdentifiers@"] = registeredAssayIdentifiers_1;
         this["Factors@"] = factors_1;
         this["Comments@"] = comments_1;
     }
     get Identifier() {
         const this$ = this;
-        return this$["identifier@653"];
+        return this$["identifier@564"];
     }
     set Identifier(i) {
         const this$ = this;
-        this$["identifier@653"] = i;
+        this$["identifier@564"] = i;
     }
     get Investigation() {
         const this$ = this;
@@ -786,14 +643,6 @@ export class ArcStudy {
         const __ = this;
         __["StudyDesignDescriptors@"] = v;
     }
-    get Tables() {
-        const __ = this;
-        return __["Tables@"];
-    }
-    set Tables(v) {
-        const __ = this;
-        __["Tables@"] = v;
-    }
     get RegisteredAssayIdentifiers() {
         const __ = this;
         return __["RegisteredAssayIdentifiers@"];
@@ -963,8 +812,8 @@ export class ArcStudy {
         const this$ = this;
         const matchValue = this$.Investigation;
         if (matchValue == null) {
-            const arg = map_2((identifier) => ArcAssay.init(identifier), this$.RegisteredAssayIdentifiers);
-            return Array.from(arg);
+            const collection = map_2((identifier) => ArcAssay.init(identifier), this$.RegisteredAssayIdentifiers);
+            return Array.from(collection);
         }
         else {
             const i = matchValue;
@@ -977,18 +826,6 @@ export class ArcStudy {
             return copy.GetRegisteredAssaysOrIdentifier();
         };
     }
-    get TableCount() {
-        const this$ = this;
-        return ArcTables__get_Count(ArcTables_$ctor_Z18C2F36D(this$.Tables)) | 0;
-    }
-    get TableNames() {
-        const this$ = this;
-        return ArcTables__get_TableNames(ArcTables_$ctor_Z18C2F36D(this$.Tables));
-    }
-    AddTable(table, index) {
-        const this$ = this;
-        ArcTables__AddTable_EC12B15(ArcTables_$ctor_Z18C2F36D(this$.Tables), table, unwrap(index));
-    }
     static addTable(table, index) {
         return (study) => {
             const c = study.Copy();
@@ -996,10 +833,6 @@ export class ArcStudy {
             return c;
         };
     }
-    AddTables(tables, index) {
-        const this$ = this;
-        ArcTables__AddTables_Z2D453886(ArcTables_$ctor_Z18C2F36D(this$.Tables), tables, unwrap(index));
-    }
     static addTables(tables, index) {
         return (study) => {
             const c = study.Copy();
@@ -1007,20 +840,12 @@ export class ArcStudy {
             return c;
         };
     }
-    InitTable(tableName, index) {
-        const this$ = this;
-        return ArcTables__InitTable_3B406CA4(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, unwrap(index));
-    }
     static initTable(tableName, index) {
         return (study) => {
             const c = study.Copy();
             return [c, c.InitTable(tableName, unwrap(index))];
         };
     }
-    InitTables(tableNames, index) {
-        const this$ = this;
-        ArcTables__InitTables_7B28792B(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableNames, unwrap(index));
-    }
     static initTables(tableNames, index) {
         return (study) => {
             const c = study.Copy();
@@ -1028,30 +853,18 @@ export class ArcStudy {
             return c;
         };
     }
-    GetTableAt(index) {
-        const this$ = this;
-        return ArcTables__GetTableAt_Z524259A4(ArcTables_$ctor_Z18C2F36D(this$.Tables), index);
-    }
     static getTableAt(index) {
         return (study) => {
             const newAssay = study.Copy();
             return newAssay.GetTableAt(index);
         };
     }
-    GetTable(name) {
-        const this$ = this;
-        return ArcTables__GetTable_Z721C83C5(ArcTables_$ctor_Z18C2F36D(this$.Tables), name);
-    }
     static getTable(name) {
         return (study) => {
             const newAssay = study.Copy();
             return newAssay.GetTable(name);
         };
     }
-    UpdateTableAt(index, table) {
-        const this$ = this;
-        ArcTables__UpdateTableAt_7E571736(ArcTables_$ctor_Z18C2F36D(this$.Tables), index, table);
-    }
     static updateTableAt(index, table) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1059,10 +872,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    UpdateTable(name, table) {
-        const this$ = this;
-        ArcTables__UpdateTable_51766571(ArcTables_$ctor_Z18C2F36D(this$.Tables), name, table);
-    }
     static updateTable(name, table) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1070,10 +879,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    SetTableAt(index, table) {
-        const this$ = this;
-        ArcTables__SetTableAt_7E571736(ArcTables_$ctor_Z18C2F36D(this$.Tables), index, table);
-    }
     static setTableAt(index, table) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1081,10 +886,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    SetTable(name, table) {
-        const this$ = this;
-        ArcTables__SetTable_51766571(ArcTables_$ctor_Z18C2F36D(this$.Tables), name, table);
-    }
     static setTable(name, table) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1092,10 +893,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    RemoveTableAt(index) {
-        const this$ = this;
-        ArcTables__RemoveTableAt_Z524259A4(ArcTables_$ctor_Z18C2F36D(this$.Tables), index);
-    }
     static removeTableAt(index) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1103,10 +900,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    RemoveTable(name) {
-        const this$ = this;
-        ArcTables__RemoveTable_Z721C83C5(ArcTables_$ctor_Z18C2F36D(this$.Tables), name);
-    }
     static removeTable(name) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1114,10 +907,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    MapTableAt(index, updateFun) {
-        const this$ = this;
-        ArcTables__MapTableAt_8FC095C(ArcTables_$ctor_Z18C2F36D(this$.Tables), index, updateFun);
-    }
     static mapTableAt(index, updateFun) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1125,10 +914,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    MapTable(name, updateFun) {
-        const this$ = this;
-        ArcTables__MapTable_27DD7B1B(ArcTables_$ctor_Z18C2F36D(this$.Tables), name, updateFun);
-    }
     static mapTable(name, updateFun) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1136,10 +921,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    RenameTableAt(index, newName) {
-        const this$ = this;
-        ArcTables__RenameTableAt_Z176EF219(ArcTables_$ctor_Z18C2F36D(this$.Tables), index, newName);
-    }
     static renameTableAt(index, newName) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1147,10 +928,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    RenameTable(name, newName) {
-        const this$ = this;
-        ArcTables__RenameTable_Z384F8060(ArcTables_$ctor_Z18C2F36D(this$.Tables), name, newName);
-    }
     static renameTable(name, newName) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1158,10 +935,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    AddColumnAt(tableIndex, header, cells, columnIndex, forceReplace) {
-        const this$ = this;
-        ArcTables__AddColumnAt_6A9784DB(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, header, unwrap(cells), unwrap(columnIndex), unwrap(forceReplace));
-    }
     static addColumnAt(tableIndex, header, cells, columnIndex, forceReplace) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1169,10 +942,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    AddColumn(tableName, header, cells, columnIndex, forceReplace) {
-        const this$ = this;
-        ArcTables__AddColumn_1FF50D3C(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, header, unwrap(cells), unwrap(columnIndex), unwrap(forceReplace));
-    }
     static addColumn(tableName, header, cells, columnIndex, forceReplace) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1180,10 +949,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    RemoveColumnAt(tableIndex, columnIndex) {
-        const this$ = this;
-        ArcTables__RemoveColumnAt_Z37302880(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, columnIndex);
-    }
     static removeColumnAt(tableIndex, columnIndex) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1191,10 +956,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    RemoveColumn(tableName, columnIndex) {
-        const this$ = this;
-        ArcTables__RemoveColumn_Z18115A39(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, columnIndex);
-    }
     static removeColumn(tableName, columnIndex) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1202,10 +963,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    UpdateColumnAt(tableIndex, columnIndex, header, cells) {
-        const this$ = this;
-        ArcTables__UpdateColumnAt_21300791(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, columnIndex, header, unwrap(cells));
-    }
     static updateColumnAt(tableIndex, columnIndex, header, cells) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1213,10 +970,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    UpdateColumn(tableName, columnIndex, header, cells) {
-        const this$ = this;
-        ArcTables__UpdateColumn_Z6083042A(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, columnIndex, header, unwrap(cells));
-    }
     static updateColumn(tableName, columnIndex, header, cells) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1224,30 +977,18 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    GetColumnAt(tableIndex, columnIndex) {
-        const this$ = this;
-        return ArcTables__GetColumnAt_Z37302880(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, columnIndex);
-    }
     static getColumnAt(tableIndex, columnIndex) {
         return (study) => {
             const newAssay = study.Copy();
             return newAssay.GetColumnAt(tableIndex, columnIndex);
         };
     }
-    GetColumn(tableName, columnIndex) {
-        const this$ = this;
-        return ArcTables__GetColumn_Z18115A39(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, columnIndex);
-    }
     static getColumn(tableName, columnIndex) {
         return (study) => {
             const newAssay = study.Copy();
             return newAssay.GetColumn(tableName, columnIndex);
         };
     }
-    AddRowAt(tableIndex, cells, rowIndex) {
-        const this$ = this;
-        ArcTables__AddRowAt_Z12CDB784(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, unwrap(cells), unwrap(rowIndex));
-    }
     static addRowAt(tableIndex, cells, rowIndex) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1255,10 +996,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    AddRow(tableName, cells, rowIndex) {
-        const this$ = this;
-        ArcTables__AddRow_Z16315DE5(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, unwrap(cells), unwrap(rowIndex));
-    }
     static addRow(tableName, cells, rowIndex) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1266,10 +1003,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    RemoveRowAt(tableIndex, rowIndex) {
-        const this$ = this;
-        ArcTables__RemoveRowAt_Z37302880(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, rowIndex);
-    }
     static removeRowAt(tableIndex, rowIndex) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1277,10 +1010,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    RemoveRow(tableName, rowIndex) {
-        const this$ = this;
-        ArcTables__RemoveRow_Z18115A39(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, rowIndex);
-    }
     static removeRow(tableName, rowIndex) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1288,10 +1017,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    UpdateRowAt(tableIndex, rowIndex, cells) {
-        const this$ = this;
-        ArcTables__UpdateRowAt_1CF7B5DC(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, rowIndex, cells);
-    }
     static updateRowAt(tableIndex, rowIndex, cells) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1299,10 +1024,6 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    UpdateRow(tableName, rowIndex, cells) {
-        const this$ = this;
-        ArcTables__UpdateRow_1BFE2CFB(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, rowIndex, cells);
-    }
     static updateRow(tableName, rowIndex, cells) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1310,20 +1031,12 @@ export class ArcStudy {
             return newAssay;
         };
     }
-    GetRowAt(tableIndex, rowIndex) {
-        const this$ = this;
-        return ArcTables__GetRowAt_Z37302880(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableIndex, rowIndex);
-    }
     static getRowAt(tableIndex, rowIndex) {
         return (study) => {
             const newAssay = study.Copy();
             return newAssay.GetRowAt(tableIndex, rowIndex);
         };
     }
-    GetRow(tableName, rowIndex) {
-        const this$ = this;
-        return ArcTables__GetRow_Z18115A39(ArcTables_$ctor_Z18C2F36D(this$.Tables), tableName, rowIndex);
-    }
     static getRow(tableName, rowIndex) {
         return (study) => {
             const newAssay = study.Copy();
@@ -1358,12 +1071,12 @@ export class ArcStudy {
         const nextContacts = map((c_2) => c_2.Copy(), this$.Contacts);
         const nextPublications = map((c_3) => c_3.Copy(), this$.Publications);
         const nextStudyDesignDescriptors = map((c_4) => c_4.Copy(), this$.StudyDesignDescriptors);
-        const arg = this$.Identifier;
-        const arg_1 = this$.Title;
-        const arg_2 = this$.Description;
-        const arg_3 = this$.SubmissionDate;
-        const arg_4 = this$.PublicReleaseDate;
-        return ArcStudy.make(arg, arg_1, arg_2, arg_3, arg_4, nextPublications, nextContacts, nextStudyDesignDescriptors, nextTables, nextAssayIdentifiers, nextFactors, nextComments);
+        const identifier = this$.Identifier;
+        const title = this$.Title;
+        const description = this$.Description;
+        const submissionDate = this$.SubmissionDate;
+        const publicReleaseDate = this$.PublicReleaseDate;
+        return ArcStudy.make(identifier, title, description, submissionDate, publicReleaseDate, nextPublications, nextContacts, nextStudyDesignDescriptors, nextTables, nextAssayIdentifiers, nextFactors, nextComments);
     }
     UpdateReferenceByStudyFile(study, onlyReplaceExisting, keepUnusedRefTables) {
         const this$ = this;
@@ -1390,8 +1103,8 @@ export class ArcStudy {
             this$.StudyDesignDescriptors = study.StudyDesignDescriptors;
         }
         if ((study.Tables.length !== 0) ? true : updateAlways) {
-            const tables = ArcTables_updateReferenceTablesBySheets_Z2EE88E97(ArcTables_$ctor_Z18C2F36D(this$.Tables), ArcTables_$ctor_Z18C2F36D(study.Tables), unwrap(keepUnusedRefTables));
-            this$.Tables = ArcTables__get_Tables(tables);
+            const tables = ArcTables.updateReferenceTablesBySheets(new ArcTables(this$.Tables), new ArcTables(study.Tables), unwrap(keepUnusedRefTables));
+            this$.Tables = tables.Tables;
         }
         if ((study.RegisteredAssayIdentifiers.length !== 0) ? true : updateAlways) {
             this$.RegisteredAssayIdentifiers = study.RegisteredAssayIdentifiers;
@@ -1405,7 +1118,7 @@ export class ArcStudy {
     }
     ToStudy(arcAssays) {
         const this$ = this;
-        const processSeq = ArcTables__GetProcesses(ArcTables_$ctor_Z18C2F36D(this$.Tables));
+        const processSeq = (new ArcTables(this$.Tables)).GetProcesses();
         const protocols = Option_fromValueWithDefault(empty(), getProtocols(processSeq));
         let studyMaterials;
         const v_4 = StudyMaterials_create_1BE9FA55(unwrap(Option_fromValueWithDefault(empty(), getSources(processSeq))), unwrap(Option_fromValueWithDefault(empty(), getSamples(processSeq))), unwrap(Option_fromValueWithDefault(empty(), getMaterials(processSeq))));
@@ -1415,17 +1128,20 @@ export class ArcStudy {
         return Study_create_Z2D28E954(void 0, unwrap(patternInput[1]), unwrap(patternInput[0]), unwrap(this$.Title), unwrap(this$.Description), unwrap(this$.SubmissionDate), unwrap(this$.PublicReleaseDate), unwrap(Option_fromValueWithDefault(empty(), ofArray(this$.Publications))), unwrap(Option_fromValueWithDefault(empty(), ofArray(this$.Contacts))), unwrap(Option_fromValueWithDefault(empty(), ofArray(this$.StudyDesignDescriptors))), unwrap(protocols), unwrap(studyMaterials), unwrap(Option_fromValueWithDefault(empty(), processSeq)), unwrap(Option_fromValueWithDefault(empty(), assays)), unwrap(Option_fromValueWithDefault(empty(), ofArray(this$.Factors))), unwrap(Option_fromValueWithDefault(empty(), getCharacteristics(processSeq))), unwrap(Option_fromValueWithDefault(empty(), getUnits(processSeq))), unwrap(Option_fromValueWithDefault(empty(), ofArray(this$.Comments))));
     }
     static fromStudy(s) {
-        const tables = map_1((arg_1) => ArcTables__get_Tables(ArcTables_fromProcesses_134EBDED(arg_1)), s.ProcessSequence);
+        const tables = map_1((arg) => {
+            const t = ArcTables.fromProcesses(arg);
+            return t.Tables;
+        }, s.ProcessSequence);
         let identifer;
         const matchValue = s.FileName;
         identifer = ((matchValue == null) ? createMissingIdentifier() : Study_identifierFromFileName(matchValue));
-        const assays = defaultArg(map_1((arg_4) => {
-            const arg_3 = map_3((arg_2) => ArcAssay.fromAssay(arg_2), arg_4);
-            return Array.from(arg_3);
+        const assays = defaultArg(map_1((arg_1) => {
+            const collection = map_3((a) => ArcAssay.fromAssay(a), arg_1);
+            return Array.from(collection);
         }, s.Assays), []);
         let assaysIdentifiers;
-        const arg_5 = map_2((a) => a.Identifier, assays);
-        assaysIdentifiers = Array.from(arg_5);
+        const collection_1 = map_2((a_1) => a_1.Identifier, assays);
+        assaysIdentifiers = Array.from(collection_1);
         return [ArcStudy.create(identifer, unwrap(s.Title), unwrap(s.Description), unwrap(s.SubmissionDate), unwrap(s.PublicReleaseDate), unwrap(map_1(toArray_1, s.Publications)), unwrap(map_1(toArray_1, s.Contacts)), unwrap(map_1(toArray_1, s.StudyDesignDescriptors)), unwrap(tables), assaysIdentifiers, unwrap(map_1(toArray_1, s.Factors)), unwrap(map_1(toArray_1, s.Comments))), assays];
     }
     StructurallyEquals(other) {
@@ -1438,49 +1154,49 @@ export class ArcStudy {
             else {
                 return false;
             }
-        }, true, toList(delay(() => map_2((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_2((i_1) => equals(item_1(i_1, a), item_1(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_2((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_2((i_2) => equals(item_1(i_2, a_1), item_1(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_2((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_2((i_3) => equals(item_1(i_3, a_2), item_1(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_2((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_2((i_4) => equals(item_1(i_4, a_3), item_1(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_2((i_5) => (item(i_5, a_4) === item(i_5, b_4)), rangeDouble(0, 1, length(a_4) - 1))))))), (a_5 = this$.Factors, (b_5 = other.Factors, (length(a_5) === length(b_5)) && fold((acc_5, e_5) => {
+        }, true, toList(delay(() => map_2((i_5) => (item_1(i_5, a_4) === item_1(i_5, b_4)), rangeDouble(0, 1, length(a_4) - 1))))))), (a_5 = this$.Factors, (b_5 = other.Factors, (length(a_5) === length(b_5)) && fold((acc_5, e_5) => {
             if (acc_5) {
                 return e_5;
             }
             else {
                 return false;
             }
-        }, true, toList(delay(() => map_2((i_6) => equals(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_2((i_6) => equals(item_1(i_6, a_5), item_1(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_2((i_7) => equals(item(i_7, a_6), item(i_7, b_6)), rangeDouble(0, 1, length(a_6) - 1)))))))]);
+        }, true, toList(delay(() => map_2((i_7) => equals(item_1(i_7, a_6), item_1(i_7, b_6)), rangeDouble(0, 1, length(a_6) - 1)))))))]);
     }
     ReferenceEquals(other) {
         const this$ = this;
@@ -1498,7 +1214,7 @@ export class ArcStudy {
 }
 
 export function ArcStudy_$reflection() {
-    return class_type("ARCtrl.ISA.ArcStudy", void 0, ArcStudy);
+    return class_type("ARCtrl.ISA.ArcStudy", void 0, ArcStudy, ArcTables_$reflection());
 }
 
 export function ArcStudy_$ctor_Z4F2D842F(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, registeredAssayIdentifiers, factors, comments) {
@@ -1541,7 +1257,7 @@ export class ArcInvestigation {
         const registeredStudyIdentifiers_1 = defaultArg(registeredStudyIdentifiers, []);
         const comments_1 = defaultArg(comments, []);
         const remarks_1 = defaultArg(remarks, []);
-        this["identifier@1321"] = identifier;
+        this["identifier@1144"] = identifier;
         this["Title@"] = title;
         this["Description@"] = description;
         this["SubmissionDate@"] = submissionDate;
@@ -1554,15 +1270,15 @@ export class ArcInvestigation {
         this["RegisteredStudyIdentifiers@"] = registeredStudyIdentifiers_1;
         this["Comments@"] = comments_1;
         this["Remarks@"] = remarks_1;
-        this["init@1302"] = 1;
+        this["init@1125"] = 1;
     }
     get Identifier() {
         const this$ = this;
-        return this$["identifier@1321"];
+        return this$["identifier@1144"];
     }
     set Identifier(i) {
         const this$ = this;
-        this$["identifier@1321"] = i;
+        this$["identifier@1144"] = i;
     }
     get Title() {
         const __ = this;
@@ -1801,8 +1517,8 @@ export class ArcInvestigation {
     }
     get RegisteredStudies() {
         const this$ = this;
-        const arg = map_2((identifier) => this$.GetStudy(identifier), this$.RegisteredStudyIdentifiers);
-        return Array.from(arg);
+        const collection = map_2((identifier) => this$.GetStudy(identifier), this$.RegisteredStudyIdentifiers);
+        return Array.from(collection);
     }
     get StudyCount() {
         const this$ = this;
@@ -2114,9 +1830,9 @@ export class ArcInvestigation {
         };
     }
     UpdateIOTypeByEntityID() {
-        let arg;
+        let collection;
         const this$ = this;
-        const ioMap = ArcTablesAux_getIOMap((arg = toList(delay(() => append_4(collect((study) => study.Tables, this$.Studies), delay(() => collect((assay) => assay.Tables, this$.Assays))))), Array.from(arg)));
+        const ioMap = ArcTablesAux_getIOMap((collection = toList(delay(() => append_4(collect((study) => study.Tables, this$.Studies), delay(() => collect((assay) => assay.Tables, this$.Assays))))), Array.from(collection)));
         let enumerator = getEnumerator(this$.Studies);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
@@ -2181,18 +1897,18 @@ export class ArcInvestigation {
         let identifer;
         const matchValue = i.Identifier;
         identifer = ((matchValue == null) ? createMissingIdentifier() : matchValue);
-        const patternInput = unzip(map_3((arg) => ArcStudy.fromStudy(arg), defaultArg(i.Studies, empty())));
+        const patternInput = unzip(map_3((s) => ArcStudy.fromStudy(s), defaultArg(i.Studies, empty())));
         const studiesRaw = patternInput[0];
         const studies = Array.from(studiesRaw);
         let studyIdentifiers;
-        const arg_1 = map_2((a) => a.Identifier, studiesRaw);
-        studyIdentifiers = Array.from(arg_1);
+        const collection = map_2((a) => a.Identifier, studiesRaw);
+        studyIdentifiers = Array.from(collection);
         let assays;
-        const arg_2 = distinctBy((a_1) => a_1.Identifier, concat(patternInput[1]), {
+        const collection_1 = distinctBy((a_1) => a_1.Identifier, concat(patternInput[1]), {
             Equals: (x, y) => (x === y),
             GetHashCode: stringHash,
         });
-        assays = Array.from(arg_2);
+        assays = Array.from(collection_1);
         return ArcInvestigation.create(identifer, i.Title, i.Description, i.SubmissionDate, i.PublicReleaseDate, void 0, map_1(toArray_1, i.Publications), map_1(toArray_1, i.Contacts), assays, studies, studyIdentifiers, map_1(toArray_1, i.Comments));
     }
     StructurallyEquals(other) {
@@ -2205,56 +1921,56 @@ export class ArcInvestigation {
             else {
                 return false;
             }
-        }, true, toList(delay(() => map_2((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_2((i_1) => equals(item_1(i_1, a), item_1(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_2((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_2((i_2) => equals(item_1(i_2, a_1), item_1(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_2((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_2((i_3) => equals(item_1(i_3, a_2), item_1(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_2((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_2((i_4) => equals(item_1(i_4, a_3), item_1(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_2((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_2((i_5) => equals(item_1(i_5, a_4), item_1(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_2((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_2((i_6) => (item_1(i_6, a_5) === item_1(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_2((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_2((i_7) => equals(item_1(i_7, a_6), item_1(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_2((i_8) => equals(item(i_8, a_7), item(i_8, b_7)), rangeDouble(0, 1, length(a_7) - 1)))))))]);
+        }, true, toList(delay(() => map_2((i_8) => equals(item_1(i_8, a_7), item_1(i_8, b_7)), rangeDouble(0, 1, length(a_7) - 1)))))))]);
     }
     ReferenceEquals(other) {
         const this$ = this;