@nfdi4plants/arctrl 3.0.0-alpha.4 → 3.0.0-beta.2

package/dist/ts/cjs/ts/Core/Table/ArcTable.js

@@ -2,135 +2,144 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArcTable = void 0;
 exports.ArcTable_$reflection = ArcTable_$reflection;
-exports.ArcTable_$ctor_76CAD84E = ArcTable_$ctor_76CAD84E;
-const CompositeHeader_js_1 = require("./CompositeHeader.js");
-const ArcTableAux_js_1 = require("./ArcTableAux.js");
+exports.ArcTable_$ctor_2D310C9B = ArcTable_$ctor_2D310C9B;
 const Util_js_1 = require("@fable-org/fable-library-js/Util.js");
 const CompositeCell_js_1 = require("./CompositeCell.js");
-const MutableMap_js_1 = require("@fable-org/fable-library-js/MutableMap.js");
+const ArcTableAux_js_1 = require("./ArcTableAux.js");
+const CompositeHeader_js_1 = require("./CompositeHeader.js");
 const Option_js_1 = require("@fable-org/fable-library-js/Option.js");
 const Seq_js_1 = require("@fable-org/fable-library-js/Seq.js");
 const CompositeColumn_js_1 = require("./CompositeColumn.js");
 const Range_js_1 = require("@fable-org/fable-library-js/Range.js");
 const Collections_js_1 = require("../Helper/Collections.js");
-const MapUtil_js_1 = require("@fable-org/fable-library-js/MapUtil.js");
-const String_js_1 = require("@fable-org/fable-library-js/String.js");
-const Array_js_1 = require("@fable-org/fable-library-js/Array.js");
 const List_js_1 = require("@fable-org/fable-library-js/List.js");
 const System_Text_js_1 = require("@fable-org/fable-library-js/System.Text.js");
 const Types_js_1 = require("@fable-org/fable-library-js/Types.js");
-const Seq2_js_1 = require("@fable-org/fable-library-js/Seq2.js");
+const Array_js_1 = require("@fable-org/fable-library-js/Array.js");
+const MapUtil_js_1 = require("@fable-org/fable-library-js/MapUtil.js");
+const String_js_1 = require("@fable-org/fable-library-js/String.js");
 const HashCodes_js_1 = require("../Helper/HashCodes.js");
 const Reflection_js_1 = require("@fable-org/fable-library-js/Reflection.js");
 class ArcTable {
-    constructor(name, headers, values) {
-        const valid = (0, ArcTableAux_js_1.SanityChecks_validate)(headers, values, true);
-        this["name@21"] = name;
-        this["headers@22"] = headers;
-        this["values@23"] = values;
+    constructor(name, headers, columns) {
+        const headers_1 = (0, Option_js_1.defaultArg)(headers, []);
+        const columns_1 = (0, Option_js_1.defaultArg)(columns, []);
+        const valid = (0, ArcTableAux_js_1.SanityChecks_validateCellColumns)(headers_1, columns_1, true);
+        this._values = ArcTableAux_js_1.ArcTableValues.fromCellColumns(columns_1);
+        this._name = name;
+        this._headers = headers_1;
+    }
+    get ValueMap() {
+        const this$ = this;
+        return this$._values.ValueMap;
+    }
+    set ValueMap(valueMap) {
+        const this$ = this;
+        this$._values.ValueMap = valueMap;
+    }
+    get ColumnRefs() {
+        const this$ = this;
+        return this$._values.Columns;
+    }
+    set ColumnRefs(internalColumnRefs) {
+        const this$ = this;
+        this$._values.Columns = internalColumnRefs;
     }
     get Headers() {
         const this$ = this;
-        return this$["headers@22"];
+        return this$._headers;
     }
     set Headers(newHeaders) {
         const this$ = this;
-        (0, ArcTableAux_js_1.SanityChecks_validate)(newHeaders, this$["values@23"], true);
-        this$["headers@22"] = newHeaders;
+        (0, ArcTableAux_js_1.SanityChecks_validateArcTableValues)(newHeaders, this$._values, true);
+        this$._headers = newHeaders;
     }
     get Values() {
         const this$ = this;
-        return this$["values@23"];
-    }
-    set Values(newValues) {
-        const this$ = this;
-        (0, ArcTableAux_js_1.SanityChecks_validate)(this$["headers@22"], newValues, true);
-        this$["values@23"] = newValues;
+        return this$._values;
     }
     get Name() {
         const this$ = this;
-        return this$["name@21"];
+        return this$._name;
     }
     set Name(newName) {
         const this$ = this;
-        this$["name@21"] = newName;
+        this$._name = newName;
     }
     static create(name, headers, values) {
         return new ArcTable(name, headers, values);
     }
     static init(name) {
-        return new ArcTable(name, [], new MutableMap_js_1.Dictionary([], {
-            Equals: Util_js_1.equalArrays,
-            GetHashCode: Util_js_1.arrayHash,
-        }));
-    }
-    static createFromHeaders(name, headers) {
-        return ArcTable.create(name, headers, new MutableMap_js_1.Dictionary([], {
-            Equals: Util_js_1.equalArrays,
-            GetHashCode: Util_js_1.arrayHash,
-        }));
+        return new ArcTable(name, [], []);
+    }
+    static fromArcTableValues(name, headers, values) {
+        const t = ArcTable.init(name);
+        t.Headers = headers;
+        t.ValueMap = values.ValueMap;
+        t.ColumnRefs = values.Columns;
+        t.RowCount = (values.RowCount | 0);
+        return t;
     }
     static createFromRows(name, headers, rows) {
-        const t = ArcTable.createFromHeaders(name, headers);
+        const t = new ArcTable(name, headers);
         t.AddRows(rows);
         return t;
     }
     Validate(raiseException) {
         const this$ = this;
         const raiseException_1 = (0, Option_js_1.defaultArg)(raiseException, true);
-        return (0, ArcTableAux_js_1.SanityChecks_validate)(this$.Headers, this$.Values, raiseException_1);
+        return (0, ArcTableAux_js_1.SanityChecks_validateArcTableValues)(this$.Headers, this$.Values, raiseException_1);
     }
     static validate(raiseException) {
         return (table) => table.Validate((0, Option_js_1.unwrap)(raiseException));
     }
     get ColumnCount() {
         const this$ = this;
-        return (0, ArcTableAux_js_1.getColumnCount)(this$.Headers) | 0;
+        return this$.Headers.length | 0;
     }
     static columnCount(table) {
         return table.ColumnCount;
     }
     get RowCount() {
         const this$ = this;
-        return (0, ArcTableAux_js_1.getRowCount)(this$.Values) | 0;
+        return this$._values.RowCount | 0;
+    }
+    set RowCount(newRowCount) {
+        const this$ = this;
+        this$._values.RowCount = (newRowCount | 0);
     }
     static rowCount(table) {
         return table.RowCount;
     }
+    static setRowCount(newRowCount) {
+        return (table) => {
+            const newTable = table.Copy();
+            newTable.RowCount = (newRowCount | 0);
+            return newTable;
+        };
+    }
     get Columns() {
         const this$ = this;
-        return (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i) => this$.GetColumn(i), (0, Range_js_1.rangeDouble)(0, 1, this$.ColumnCount - 1))));
+        return Array.from((0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i) => this$.GetColumn(i), (0, Range_js_1.rangeDouble)(0, 1, this$.ColumnCount - 1)))));
     }
     Copy() {
         const this$ = this;
         const nextHeaders = (0, Collections_js_1.ResizeArray_map)((h) => h.Copy(), this$.Headers);
-        const nextValues = new MutableMap_js_1.Dictionary([], {
-            Equals: Util_js_1.equalArrays,
-            GetHashCode: Util_js_1.arrayHash,
-        });
-        (0, Seq_js_1.iterate)((tupledArg) => {
-            const ci = tupledArg[0] | 0;
-            const ri = tupledArg[1] | 0;
-            (0, MapUtil_js_1.addToDict)(nextValues, [ci, ri], (0, MapUtil_js_1.getItemFromDict)(this$.Values, [ci, ri]).Copy());
-        }, this$.Values.keys());
-        return ArcTable.create(this$.Name, nextHeaders, nextValues);
+        const nextValues = this$._values.Copy();
+        return ArcTable.fromArcTableValues(this$.Name, nextHeaders, nextValues);
     }
     TryGetCellAt(column, row) {
         const this$ = this;
-        return (0, ArcTableAux_js_1.Unchecked_tryGetCellAt)(column, row, this$.Values);
+        return (0, ArcTableAux_js_1.Unchecked_tryGetCellAt)(column, row, this$._values);
     }
     static tryGetCellAt(column, row) {
         return (table) => table.TryGetCellAt(column, row);
     }
     GetCellAt(column, row) {
         const this$ = this;
-        try {
-            return (0, MapUtil_js_1.getItemFromDict)(this$.Values, [column, row]);
-        }
-        catch (matchValue) {
-            const arg_2 = this$.Name;
-            return (0, String_js_1.toFail)((0, String_js_1.printf)("Unable to find cell for index: (%i, %i) in table %s"))(column)(row)(arg_2);
-        }
+        (0, ArcTableAux_js_1.SanityChecks_validateColumnIndex)(column, this$.ColumnCount, false);
+        (0, ArcTableAux_js_1.SanityChecks_validateRowIndex)(row, this$.RowCount, false);
+        return (0, ArcTableAux_js_1.Unchecked_getCellWithDefault)(column, row, this$._headers, this$._values);
     }
     static getCellAt(column, row) {
         return (table) => table.GetCellAt(column, row);
@@ -168,7 +177,7 @@ class ArcTable {
             (0, ArcTableAux_js_1.SanityChecks_validateRowIndex)(rowIndex, this$.RowCount, false);
             c.ValidateAgainstHeader(this$.Headers[columnIndex], true);
         }
-        (0, ArcTableAux_js_1.Unchecked_setCellAt)(columnIndex, rowIndex, c, this$.Values);
+        (0, ArcTableAux_js_1.Unchecked_setCellAt)(columnIndex, rowIndex, c, this$._values);
     }
     static updateCellAt(columnIndex, rowIndex, cell, skipValidation) {
         return (table) => {
@@ -183,7 +192,7 @@ class ArcTable {
             (0, ArcTableAux_js_1.SanityChecks_validateColumnIndex)(columnIndex, this$.ColumnCount, false);
             c.ValidateAgainstHeader(this$.Headers[columnIndex], true);
         }
-        (0, ArcTableAux_js_1.Unchecked_setCellAt)(columnIndex, rowIndex, c, this$.Values);
+        (0, ArcTableAux_js_1.Unchecked_setCellAt)(columnIndex, rowIndex, c, this$._values);
     }
     static setCellAt(columnIndex, rowIndex, cell, skipValidation) {
         return (table) => {
@@ -195,7 +204,7 @@ class ArcTable {
     UpdateCellsBy(f, skipValidation) {
         const this$ = this;
         const skipValidation_1 = (0, Option_js_1.defaultArg)(skipValidation, false);
-        let enumerator = (0, Util_js_1.getEnumerator)(this$.Values);
+        const enumerator = (0, Util_js_1.getEnumerator)(this$._values);
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const kv = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -206,7 +215,7 @@ class ArcTable {
                 if (!skipValidation_1) {
                     newCell.ValidateAgainstHeader(this$.Headers[ci], true);
                 }
-                (0, ArcTableAux_js_1.Unchecked_setCellAt)(ci, ri, newCell, this$.Values);
+                (0, ArcTableAux_js_1.Unchecked_setCellAt)(ci, ri, newCell, this$._values);
             }
         }
         finally {
@@ -230,7 +239,7 @@ class ArcTable {
         if (!skipValidation_1) {
             newCell.ValidateAgainstHeader(this$.Headers[columnIndex], true);
         }
-        (0, ArcTableAux_js_1.Unchecked_setCellAt)(columnIndex, rowIndex, newCell, this$.Values);
+        (0, ArcTableAux_js_1.Unchecked_setCellAt)(columnIndex, rowIndex, newCell, this$._values);
     }
     static updateCellBy(columnIndex, rowIndex, f, skipValidation) {
         return (table) => {
@@ -253,14 +262,14 @@ class ArcTable {
             setHeader = (this$.Headers[index] = newHeader);
         }
         else if (forceConvertCells_1) {
-            const convertedCells = newHeader.IsTermColumn ? (0, Array_js_1.map)((c_1) => {
+            const convertedCells = newHeader.IsTermColumn ? (0, Collections_js_1.ResizeArray_map)((c_1) => {
                 if (c_1.isFreeText) {
                     return c_1.ToTermCell();
                 }
                 else {
                     return c_1;
                 }
-            }, c.Cells) : (0, Array_js_1.map)((c_2) => c_2.ToFreeTextCell(), c.Cells);
+            }, c.Cells) : (0, Collections_js_1.ResizeArray_map)((c_2) => c_2.ToFreeTextCell(), c.Cells);
             this$.UpdateColumn(index, newHeader, convertedCells);
         }
         else {
@@ -274,17 +283,14 @@ class ArcTable {
             return newTable;
         };
     }
-    AddColumn(header, cells, index, forceReplace, skipFillMissing) {
+    AddColumn(header, cells, index, forceReplace) {
         const this$ = this;
         const index_1 = (0, Option_js_1.defaultArg)(index, this$.ColumnCount) | 0;
         const cells_1 = (0, Option_js_1.defaultArg)(cells, []);
         const forceReplace_1 = (0, Option_js_1.defaultArg)(forceReplace, false);
         (0, ArcTableAux_js_1.SanityChecks_validateColumnIndex)(index_1, this$.ColumnCount, true);
         (0, ArcTableAux_js_1.SanityChecks_validateColumn)(CompositeColumn_js_1.CompositeColumn.create(header, cells_1));
-        (0, ArcTableAux_js_1.Unchecked_addColumn)(header, cells_1, index_1, forceReplace_1, false, this$.Headers, this$.Values);
-        if (!(0, Util_js_1.equals)(skipFillMissing, true)) {
-            (0, ArcTableAux_js_1.Unchecked_fillMissingCells)(this$.Headers, this$.Values);
-        }
+        (0, ArcTableAux_js_1.Unchecked_addColumn)(header, cells_1, index_1, forceReplace_1, false, this$.Headers, this$._values);
     }
     static addColumn(header, cells, index, forceReplace) {
         return (table) => {
@@ -295,8 +301,11 @@ class ArcTable {
     }
     AddColumnFill(header, cell, index, forceReplace) {
         const this$ = this;
-        const cells = (0, Array_js_1.initialize)(this$.RowCount, (_arg) => cell.Copy());
-        this$.AddColumn(header, cells, (0, Option_js_1.unwrap)(index), (0, Option_js_1.unwrap)(forceReplace));
+        const index_1 = (0, Option_js_1.defaultArg)(index, this$.ColumnCount) | 0;
+        const forceReplace_1 = (0, Option_js_1.defaultArg)(forceReplace, false);
+        (0, ArcTableAux_js_1.SanityChecks_validateColumnIndex)(index_1, this$.ColumnCount, true);
+        (0, ArcTableAux_js_1.SanityChecks_validateColumn)(CompositeColumn_js_1.CompositeColumn.create(header, [cell]));
+        (0, ArcTableAux_js_1.Unchecked_addColumnFill)(header, cell, index_1, forceReplace_1, false, this$.Headers, this$._values);
     }
     static addColumnFill(header, cell, index, forceReplace) {
         return (table) => {
@@ -305,7 +314,7 @@ class ArcTable {
             return newTable;
         };
     }
-    UpdateColumn(columnIndex, header, cells, skipFillMissing) {
+    UpdateColumn(columnIndex, header, cells) {
         const this$ = this;
         (0, ArcTableAux_js_1.SanityChecks_validateColumnIndex)(columnIndex, this$.ColumnCount, false);
         const column = CompositeColumn_js_1.CompositeColumn.create(header, (0, Option_js_1.unwrap)(cells));
@@ -316,14 +325,11 @@ class ArcTable {
             throw new Error(`Invalid input. Tried setting unique header \`${header_1}\`, but header of same type already exists at index ${(0, Option_js_1.value)(matchValue)}.`);
         }
         (0, ArcTableAux_js_1.Unchecked_removeHeader)(columnIndex, this$.Headers);
-        (0, ArcTableAux_js_1.Unchecked_removeColumnCells)(columnIndex, this$.Values);
+        (0, ArcTableAux_js_1.Unchecked_removeColumnCells)(columnIndex, this$._values);
         this$.Headers.splice(columnIndex, 0, column.Header);
-        (0, Array_js_1.iterateIndexed)((rowIndex, v) => {
-            (0, ArcTableAux_js_1.Unchecked_setCellAt)(columnIndex, rowIndex, v, this$.Values);
+        (0, Collections_js_1.ResizeArray_iteri)((rowIndex, v) => {
+            (0, ArcTableAux_js_1.Unchecked_setCellAt)(columnIndex, rowIndex, v, this$._values);
         }, column.Cells);
-        if (!(0, Util_js_1.equals)(skipFillMissing, true)) {
-            (0, ArcTableAux_js_1.Unchecked_fillMissingCells)(this$.Headers, this$.Values);
-        }
     }
     static updateColumn(columnIndex, header, cells) {
         return (table) => {
@@ -354,7 +360,7 @@ class ArcTable {
             return newTable;
         };
     }
-    AddColumns(columns, index, forceReplace, skipFillMissing) {
+    AddColumns(columns, index, forceReplace) {
         const this$ = this;
         let index_1 = (0, Option_js_1.defaultArg)(index, this$.ColumnCount);
         const forceReplace_1 = (0, Option_js_1.defaultArg)(forceReplace, false);
@@ -368,24 +374,21 @@ class ArcTable {
             }, duplicates);
             throw new Error((0, Types_js_1.toString)(sb));
         }
-        columns.forEach((x_2) => {
+        (0, Seq_js_1.iterate)((x_2) => {
             (0, ArcTableAux_js_1.SanityChecks_validateColumn)(x_2);
-        });
-        columns.forEach((col) => {
+        }, columns);
+        (0, Seq_js_1.iterate)((col) => {
             const prevHeadersCount = this$.Headers.length | 0;
-            (0, ArcTableAux_js_1.Unchecked_addColumn)(col.Header, col.Cells, index_1, forceReplace_1, false, this$.Headers, this$.Values);
+            (0, ArcTableAux_js_1.Unchecked_addColumn)(col.Header, col.Cells, index_1, forceReplace_1, false, this$.Headers, this$._values);
             if (this$.Headers.length > prevHeadersCount) {
                 index_1 = ((index_1 + 1) | 0);
             }
-        });
-        if (!(0, Util_js_1.equals)(skipFillMissing, true)) {
-            (0, ArcTableAux_js_1.Unchecked_fillMissingCells)(this$.Headers, this$.Values);
-        }
+        }, columns);
     }
-    static addColumns(columns, index, skipFillMissing) {
+    static addColumns(columns, index) {
         return (table) => {
             const newTable = table.Copy();
-            newTable.AddColumns(columns, (0, Option_js_1.unwrap)(index), undefined, (0, Option_js_1.unwrap)(skipFillMissing));
+            newTable.AddColumns(columns, (0, Option_js_1.unwrap)(index));
             return newTable;
         };
     }
@@ -394,7 +397,7 @@ class ArcTable {
         (0, ArcTableAux_js_1.SanityChecks_validateColumnIndex)(index, this$.ColumnCount, false);
         const columnCount = this$.ColumnCount | 0;
         (0, ArcTableAux_js_1.Unchecked_removeHeader)(index, this$.Headers);
-        (0, ArcTableAux_js_1.Unchecked_removeColumnCells_withIndexChange)(index, columnCount, this$.RowCount, this$.Values);
+        (0, ArcTableAux_js_1.Unchecked_removeColumnCells_withIndexChange)(index, columnCount, this$._values);
     }
     static removeColumn(index) {
         return (table) => {
@@ -422,42 +425,59 @@ class ArcTable {
             return newTable;
         };
     }
-    GetColumn(columnIndex) {
+    GetColumn(columnIndex, fillDefault) {
         const this$ = this;
+        const fillDefault_1 = (0, Option_js_1.defaultArg)(fillDefault, false);
         (0, ArcTableAux_js_1.SanityChecks_validateColumnIndex)(columnIndex, this$.ColumnCount, false);
         const h = this$.Headers[columnIndex];
-        const cells = (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.collect)((i) => {
-            const matchValue = this$.TryGetCellAt(columnIndex, i);
-            if (matchValue != null) {
-                return (0, Seq_js_1.singleton)((0, Option_js_1.value)(matchValue));
+        const cells = [];
+        if (this$.RowCount !== 0) {
+            const col = (0, MapUtil_js_1.getItemFromDict)(this$._values.Columns, columnIndex);
+            if (col.tag === /* Sparse */ 1) {
+                const vals = col.fields[0];
+                const emptyCell = (0, ArcTableAux_js_1.getEmptyCellForHeader)(h, undefined);
+                for (let rowIndex = 0; rowIndex <= (this$.RowCount - 1); rowIndex++) {
+                    if (vals.has(rowIndex)) {
+                        void (cells.push((0, MapUtil_js_1.getItemFromDict)(this$._values.ValueMap, (0, MapUtil_js_1.getItemFromDict)(vals, rowIndex))));
+                    }
+                    else if (fillDefault_1) {
+                        void (cells.push(emptyCell));
+                    }
+                    else {
+                        (0, String_js_1.toFail)((0, String_js_1.printf)("Could not return column: Unable to find cell for index: (%i, %i)"))(columnIndex)(rowIndex);
+                    }
+                }
             }
             else {
-                (0, String_js_1.toFail)((0, String_js_1.printf)("Unable to find cell for index: (%i, %i)"))(columnIndex)(i);
-                return (0, Seq_js_1.empty)();
+                const valueHash = col.fields[0] | 0;
+                const c = (0, MapUtil_js_1.getItemFromDict)(this$._values.ValueMap, valueHash);
+                for (let i = 0; i <= (this$.RowCount - 1); i++) {
+                    void (cells.push(c));
+                }
             }
-        }, (0, Range_js_1.rangeDouble)(0, 1, this$.RowCount - 1))));
+        }
         return CompositeColumn_js_1.CompositeColumn.create(h, cells);
     }
-    static getColumn(index) {
-        return (table) => table.GetColumn(index);
+    static getColumn(index, fillDefault) {
+        return (table) => table.GetColumn(index, (0, Option_js_1.unwrap)(fillDefault));
     }
-    TryGetColumnByHeader(header) {
+    TryGetColumnByHeader(header, fillDefault) {
         const this$ = this;
-        return (0, Option_js_1.map)((i) => this$.GetColumn(i), (0, Seq_js_1.tryFindIndex)((x) => (0, Util_js_1.equals)(x, header), this$.Headers));
+        return (0, Option_js_1.map)((i) => this$.GetColumn(i, (0, Option_js_1.unwrap)(fillDefault)), (0, Seq_js_1.tryFindIndex)((x) => (0, Util_js_1.equals)(x, header), this$.Headers));
     }
-    static tryGetColumnByHeader(header) {
-        return (table) => table.TryGetColumnByHeader(header);
+    static tryGetColumnByHeader(header, fillDefault) {
+        return (table) => table.TryGetColumnByHeader(header, (0, Option_js_1.unwrap)(fillDefault));
     }
-    TryGetColumnByHeaderBy(headerPredicate) {
+    TryGetColumnByHeaderBy(headerPredicate, fillDefault) {
         const this$ = this;
-        return (0, Option_js_1.map)((i) => this$.GetColumn(i), (0, Seq_js_1.tryFindIndex)(headerPredicate, this$.Headers));
+        return (0, Option_js_1.map)((i) => this$.GetColumn(i, (0, Option_js_1.unwrap)(fillDefault)), (0, Seq_js_1.tryFindIndex)(headerPredicate, this$.Headers));
     }
-    static tryGetColumnByHeaderBy(headerPredicate) {
-        return (table) => table.TryGetColumnByHeaderBy(headerPredicate);
+    static tryGetColumnByHeaderBy(headerPredicate, fillDefault) {
+        return (table) => table.TryGetColumnByHeaderBy(headerPredicate, (0, Option_js_1.unwrap)(fillDefault));
     }
-    GetColumnByHeader(header) {
+    GetColumnByHeader(header, fillDefault) {
         const this$ = this;
-        const matchValue = this$.TryGetColumnByHeader(header);
+        const matchValue = this$.TryGetColumnByHeader(header, (0, Option_js_1.unwrap)(fillDefault));
         if (matchValue == null) {
             const arg = this$.Name;
             return (0, String_js_1.toFail)((0, String_js_1.printf)("Unable to find column with header in table %s: %O"))(arg)(header);
@@ -466,8 +486,8 @@ class ArcTable {
             return (0, Option_js_1.value)(matchValue);
         }
     }
-    static getColumnByHeader(header) {
-        return (table) => table.GetColumnByHeader(header);
+    static getColumnByHeader(header, fillDefault) {
+        return (table) => table.GetColumnByHeader(header, (0, Option_js_1.unwrap)(fillDefault));
     }
     TryGetInputColumn() {
         const this$ = this;
@@ -522,7 +542,7 @@ class ArcTable {
             (0, String_js_1.toFail)((0, String_js_1.printf)("Cannt move column. Invalid end column index: %i"))(endCol);
         }
         else {
-            (0, ArcTableAux_js_1.Unchecked_moveColumnTo)(this$.RowCount, startCol, endCol, this$.Headers, this$.Values);
+            (0, ArcTableAux_js_1.Unchecked_moveColumnTo)(startCol, endCol, this$.Headers, this$._values);
         }
     }
     static moveColumn(startCol, endCol) {
@@ -535,22 +555,28 @@ class ArcTable {
     AddRow(cells, index) {
         const this$ = this;
         const index_1 = (0, Option_js_1.defaultArg)(index, this$.RowCount) | 0;
-        const cells_1 = (cells == null) ? (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.collect)((columnIndex) => (0, Seq_js_1.singleton)((0, ArcTableAux_js_1.Unchecked_getEmptyCellForHeader)(this$.Headers[columnIndex], (0, ArcTableAux_js_1.Unchecked_tryGetCellAt)(columnIndex, 0, this$.Values))), (0, Range_js_1.rangeDouble)(0, 1, this$.ColumnCount - 1)))) : (0, Option_js_1.value)(cells);
         (0, ArcTableAux_js_1.SanityChecks_validateRowIndex)(index_1, this$.RowCount, true);
-        const newCells = cells_1;
-        const columnCount = this$.ColumnCount | 0;
-        const newCellsCount = (0, Seq_js_1.length)(newCells) | 0;
-        if (columnCount === 0) {
-            throw new Error("Table contains no columns! Cannot add row to empty table!");
-        }
-        else if (newCellsCount !== columnCount) {
-            throw new Error(`Cannot add a new row with ${newCellsCount} cells, as the table has ${columnCount} columns.`);
+        if (cells != null) {
+            const cells_1 = (0, Option_js_1.value)(cells);
+            const newCells = cells_1;
+            const columnCount = this$.ColumnCount | 0;
+            const newCellsCount = (0, Seq_js_1.length)(newCells) | 0;
+            if (columnCount === 0) {
+                throw new Error("Table contains no columns! Cannot add row to empty table!");
+            }
+            else if (newCellsCount !== columnCount) {
+                throw new Error(`Cannot add a new row with ${newCellsCount} cells, as the table has ${columnCount} columns.`);
+            }
+            for (let columnIndex = 0; columnIndex <= (this$.ColumnCount - 1); columnIndex++) {
+                const h = this$.Headers[columnIndex];
+                const column = CompositeColumn_js_1.CompositeColumn.create(h, [cells_1[columnIndex]]);
+                cells_1[columnIndex].ValidateAgainstHeader(h, true);
+            }
+            (0, ArcTableAux_js_1.Unchecked_addRow)(index_1, cells_1, this$.Headers, this$._values);
         }
-        for (let columnIndex_1 = 0; columnIndex_1 <= (this$.ColumnCount - 1); columnIndex_1++) {
-            const h_1 = this$.Headers[columnIndex_1];
-            (0, ArcTableAux_js_1.SanityChecks_validateColumn)(CompositeColumn_js_1.CompositeColumn.create(h_1, [(0, Array_js_1.item)(columnIndex_1, cells_1)]));
+        else {
+            (0, ArcTableAux_js_1.Unchecked_addEmptyRow)(index_1, this$._values);
         }
-        (0, ArcTableAux_js_1.Unchecked_addRow)(index_1, cells_1, this$.Headers, this$.Values);
     }
     static addRow(cells, index) {
         return (table) => {
@@ -571,12 +597,12 @@ class ArcTable {
         else if (newCellsCount !== columnCount) {
             throw new Error(`Cannot add a new row with ${newCellsCount} cells, as the table has ${columnCount} columns.`);
         }
-        (0, Array_js_1.iterateIndexed)((i, cell) => {
+        (0, Collections_js_1.ResizeArray_iteri)((i, cell) => {
             const h = this$.Headers[i];
-            (0, ArcTableAux_js_1.SanityChecks_validateColumn)(CompositeColumn_js_1.CompositeColumn.create(h, [cell]));
+            (0, ArcTableAux_js_1.SanityChecks_validateColumn)(CompositeColumn_js_1.CompositeColumn.create(h, (0, Collections_js_1.ResizeArray_singleton)(cell)));
         }, cells);
-        (0, Array_js_1.iterateIndexed)((columnIndex, cell_1) => {
-            (0, ArcTableAux_js_1.Unchecked_setCellAt)(columnIndex, rowIndex, cell_1, this$.Values);
+        (0, Collections_js_1.ResizeArray_iteri)((columnIndex, cell_1) => {
+            (0, ArcTableAux_js_1.Unchecked_setCellAt)(columnIndex, rowIndex, cell_1, this$._values);
         }, cells);
     }
     static updateRow(rowIndex, cells) {
@@ -612,7 +638,7 @@ class ArcTable {
         const this$ = this;
         let index_1 = (0, Option_js_1.defaultArg)(index, this$.RowCount);
         (0, ArcTableAux_js_1.SanityChecks_validateRowIndex)(index_1, this$.RowCount, true);
-        rows.forEach((row) => {
+        (0, Collections_js_1.ResizeArray_iter)((row) => {
             const newCells = row;
             const columnCount = this$.ColumnCount | 0;
             const newCellsCount = (0, Seq_js_1.length)(newCells) | 0;
@@ -622,15 +648,21 @@ class ArcTable {
             else if (newCellsCount !== columnCount) {
                 throw new Error(`Cannot add a new row with ${newCellsCount} cells, as the table has ${columnCount} columns.`);
             }
-        });
-        for (let idx = 0; idx <= (rows.length - 1); idx++) {
-            const row_1 = (0, Array_js_1.item)(idx, rows);
-            for (let columnIndex = 0; columnIndex <= (this$.ColumnCount - 1); columnIndex++) {
-                const h = this$.Headers[columnIndex];
-                (0, ArcTableAux_js_1.SanityChecks_validateColumn)(CompositeColumn_js_1.CompositeColumn.create(h, [(0, Array_js_1.item)(columnIndex, row_1)]));
+        }, rows);
+        let enumerator = (0, Util_js_1.getEnumerator)(rows);
+        try {
+            while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
+                const row_1 = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
+                for (let columnIndex = 0; columnIndex <= (this$.ColumnCount - 1); columnIndex++) {
+                    const h = this$.Headers[columnIndex];
+                    row_1[columnIndex].ValidateAgainstHeader(h, true);
+                }
             }
         }
-        (0, ArcTableAux_js_1.Unchecked_addRows)(index_1, rows, this$.Headers, this$.Values);
+        finally {
+            (0, Util_js_1.disposeSafe)(enumerator);
+        }
+        (0, ArcTableAux_js_1.Unchecked_addRows)(index_1, rows, this$.Headers, this$._values);
     }
     static addRows(rows, index) {
         return (table) => {
@@ -641,8 +673,10 @@ class ArcTable {
     }
     AddRowsEmpty(rowCount, index) {
         const this$ = this;
-        const row = (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.collect)((columnIndex) => (0, Seq_js_1.singleton)((0, ArcTableAux_js_1.Unchecked_getEmptyCellForHeader)(this$.Headers[columnIndex], (0, ArcTableAux_js_1.Unchecked_tryGetCellAt)(columnIndex, 0, this$.Values))), (0, Range_js_1.rangeDouble)(0, 1, this$.ColumnCount - 1))));
-        const rows = (0, Array_js_1.initialize)(rowCount, (_arg) => row);
+        let row;
+        const collection = (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.collect)((columnIndex) => (0, Seq_js_1.singleton)((0, ArcTableAux_js_1.getEmptyCellForHeader)(this$.Headers[columnIndex], (0, ArcTableAux_js_1.Unchecked_tryGetCellAt)(columnIndex, 0, this$._values))), (0, Range_js_1.rangeDouble)(0, 1, this$.ColumnCount - 1))));
+        row = Array.from(collection);
+        const rows = (0, Collections_js_1.ResizeArray_init)(rowCount, (_arg) => row);
         this$.AddRows(rows, (0, Option_js_1.unwrap)(index));
     }
     static addRowsEmpty(rowCount, index) {
@@ -655,7 +689,7 @@ class ArcTable {
     RemoveRow(index) {
         const this$ = this;
         (0, ArcTableAux_js_1.SanityChecks_validateRowIndex)(index, this$.RowCount, false);
-        (0, ArcTableAux_js_1.Unchecked_removeRowCells_withIndexChange)(index, this$.ColumnCount, this$.RowCount, this$.Values);
+        (0, ArcTableAux_js_1.Unchecked_removeRowCells_withIndexChange)(index, this$._values);
     }
     static removeRow(index) {
         return (table) => {
@@ -688,31 +722,31 @@ class ArcTable {
         if (!(0, Util_js_1.equals)(SkipValidation, true)) {
             (0, ArcTableAux_js_1.SanityChecks_validateRowIndex)(rowIndex, this$.RowCount, false);
         }
-        return (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((columnIndex) => (0, Option_js_1.value)(this$.TryGetCellAt(columnIndex, rowIndex)), (0, Range_js_1.rangeDouble)(0, 1, this$.ColumnCount - 1))));
+        const collection = (0, Seq_js_1.toArray)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((columnIndex) => this$.GetCellAt(columnIndex, rowIndex), (0, Range_js_1.rangeDouble)(0, 1, this$.ColumnCount - 1))));
+        return Array.from(collection);
     }
     static getRow(index) {
         return (table) => table.GetRow(index);
     }
-    Join(table, index, joinOptions, forceReplace, skipFillMissing) {
+    Join(table, index, joinOptions, forceReplace) {
         const this$ = this;
         const joinOptions_1 = (0, Option_js_1.defaultArg)(joinOptions, "headers");
         const forceReplace_1 = (0, Option_js_1.defaultArg)(forceReplace, false);
-        const skipFillMissing_1 = (0, Option_js_1.defaultArg)(skipFillMissing, false);
         let index_1 = (0, Option_js_1.defaultArg)(index, this$.ColumnCount);
         index_1 = (((index_1 === -1) ? this$.ColumnCount : index_1) | 0);
         (0, ArcTableAux_js_1.SanityChecks_validateColumnIndex)(index_1, this$.ColumnCount, true);
         const onlyHeaders = (0, Util_js_1.equals)(joinOptions_1, "headers");
         let columns;
         const pre = table.Columns;
-        columns = ((joinOptions_1 === "withUnit") ? (0, Array_js_1.map)((c_1) => {
+        columns = ((joinOptions_1 === "withUnit") ? (0, Collections_js_1.ResizeArray_map)((c_1) => {
             const unitsOpt = c_1.TryGetColumnUnits();
             if (unitsOpt == null) {
                 return new CompositeColumn_js_1.CompositeColumn(c_1.Header, []);
             }
             else {
-                return new CompositeColumn_js_1.CompositeColumn(c_1.Header, (0, Array_js_1.map)((u) => CompositeCell_js_1.CompositeCell.createUnitized("", u), (0, Option_js_1.value)(unitsOpt)));
+                return new CompositeColumn_js_1.CompositeColumn(c_1.Header, (0, Collections_js_1.ResizeArray_map)((u) => CompositeCell_js_1.CompositeCell.createUnitized("", u), (0, Option_js_1.value)(unitsOpt)));
             }
-        }, pre) : ((joinOptions_1 === "withValues") ? pre : (0, Array_js_1.map)((c) => (new CompositeColumn_js_1.CompositeColumn(c.Header, [])), pre)));
+        }, pre) : ((joinOptions_1 === "withValues") ? pre : (0, Collections_js_1.ResizeArray_map)((c) => (new CompositeColumn_js_1.CompositeColumn(c.Header, [])), pre)));
         const duplicates = (0, ArcTableAux_js_1.tryFindDuplicateUniqueInArray)((0, Seq_js_1.map)((x) => x.Header, columns));
         if (!(0, List_js_1.isEmpty)(duplicates)) {
             const sb = (0, System_Text_js_1.StringBuilder_$ctor)();
@@ -722,19 +756,16 @@ class ArcTable {
             }, duplicates);
             throw new Error((0, Types_js_1.toString)(sb));
         }
-        columns.forEach((x_2) => {
+        (0, Collections_js_1.ResizeArray_iter)((x_2) => {
             (0, ArcTableAux_js_1.SanityChecks_validateColumn)(x_2);
-        });
-        columns.forEach((col) => {
+        }, columns);
+        (0, Collections_js_1.ResizeArray_iter)((col) => {
             const prevHeadersCount = this$.Headers.length | 0;
-            (0, ArcTableAux_js_1.Unchecked_addColumn)(col.Header, col.Cells, index_1, forceReplace_1, onlyHeaders, this$.Headers, this$.Values);
+            (0, ArcTableAux_js_1.Unchecked_addColumn)(col.Header, col.Cells, index_1, forceReplace_1, onlyHeaders, this$.Headers, this$._values);
             if (this$.Headers.length > prevHeadersCount) {
                 index_1 = ((index_1 + 1) | 0);
             }
-        });
-        if (!skipFillMissing_1) {
-            (0, ArcTableAux_js_1.Unchecked_fillMissingCells)(this$.Headers, this$.Values);
-        }
+        }, columns);
     }
     static join(table, index, joinOptions, forceReplace) {
         return (this$) => {
@@ -743,30 +774,30 @@ class ArcTable {
             return copy;
         };
     }
-    AddProtocolTypeColumn(types, index) {
+    AddProtocolTypeColumn(types, index, forceReplace) {
         const this$ = this;
-        const cells = (0, Option_js_1.map)((array) => (0, Array_js_1.map)(CompositeCell_js_1.CompositeCell_Term, array), types);
-        this$.AddColumn((0, CompositeHeader_js_1.CompositeHeader_ProtocolType)(), (0, Option_js_1.unwrap)(cells), (0, Option_js_1.unwrap)(index));
+        const cells = (0, Option_js_1.map)((a) => (0, Collections_js_1.ResizeArray_map)(CompositeCell_js_1.CompositeCell_Term, a), types);
+        this$.AddColumn((0, CompositeHeader_js_1.CompositeHeader_ProtocolType)(), (0, Option_js_1.unwrap)(cells), (0, Option_js_1.unwrap)(index), (0, Option_js_1.unwrap)(forceReplace));
     }
-    AddProtocolVersionColumn(versions, index) {
+    AddProtocolVersionColumn(versions, index, forceReplace) {
         const this$ = this;
-        const cells = (0, Option_js_1.map)((array) => (0, Array_js_1.map)(CompositeCell_js_1.CompositeCell_FreeText, array), versions);
-        this$.AddColumn((0, CompositeHeader_js_1.CompositeHeader_ProtocolVersion)(), (0, Option_js_1.unwrap)(cells), (0, Option_js_1.unwrap)(index));
+        const cells = (0, Option_js_1.map)((a) => (0, Collections_js_1.ResizeArray_map)(CompositeCell_js_1.CompositeCell_FreeText, a), versions);
+        this$.AddColumn((0, CompositeHeader_js_1.CompositeHeader_ProtocolVersion)(), (0, Option_js_1.unwrap)(cells), (0, Option_js_1.unwrap)(index), (0, Option_js_1.unwrap)(forceReplace));
     }
-    AddProtocolUriColumn(uris, index) {
+    AddProtocolUriColumn(uris, index, forceReplace) {
         const this$ = this;
-        const cells = (0, Option_js_1.map)((array) => (0, Array_js_1.map)(CompositeCell_js_1.CompositeCell_FreeText, array), uris);
-        this$.AddColumn((0, CompositeHeader_js_1.CompositeHeader_ProtocolUri)(), (0, Option_js_1.unwrap)(cells), (0, Option_js_1.unwrap)(index));
+        const cells = (0, Option_js_1.map)((a) => (0, Collections_js_1.ResizeArray_map)(CompositeCell_js_1.CompositeCell_FreeText, a), uris);
+        this$.AddColumn((0, CompositeHeader_js_1.CompositeHeader_ProtocolUri)(), (0, Option_js_1.unwrap)(cells), (0, Option_js_1.unwrap)(index), (0, Option_js_1.unwrap)(forceReplace));
     }
-    AddProtocolDescriptionColumn(descriptions, index) {
+    AddProtocolDescriptionColumn(descriptions, index, forceReplace) {
         const this$ = this;
-        const cells = (0, Option_js_1.map)((array) => (0, Array_js_1.map)(CompositeCell_js_1.CompositeCell_FreeText, array), descriptions);
-        this$.AddColumn((0, CompositeHeader_js_1.CompositeHeader_ProtocolDescription)(), (0, Option_js_1.unwrap)(cells), (0, Option_js_1.unwrap)(index));
+        const cells = (0, Option_js_1.map)((a) => (0, Collections_js_1.ResizeArray_map)(CompositeCell_js_1.CompositeCell_FreeText, a), descriptions);
+        this$.AddColumn((0, CompositeHeader_js_1.CompositeHeader_ProtocolDescription)(), (0, Option_js_1.unwrap)(cells), (0, Option_js_1.unwrap)(index), (0, Option_js_1.unwrap)(forceReplace));
     }
-    AddProtocolNameColumn(names, index) {
+    AddProtocolNameColumn(names, index, forceReplace) {
         const this$ = this;
-        const cells = (0, Option_js_1.map)((array) => (0, Array_js_1.map)(CompositeCell_js_1.CompositeCell_FreeText, array), names);
-        this$.AddColumn((0, CompositeHeader_js_1.CompositeHeader_ProtocolREF)(), (0, Option_js_1.unwrap)(cells), (0, Option_js_1.unwrap)(index));
+        const cells = (0, Option_js_1.map)((a) => (0, Collections_js_1.ResizeArray_map)(CompositeCell_js_1.CompositeCell_FreeText, a), names);
+        this$.AddColumn((0, CompositeHeader_js_1.CompositeHeader_ProtocolREF)(), (0, Option_js_1.unwrap)(cells), (0, Option_js_1.unwrap)(index), (0, Option_js_1.unwrap)(forceReplace));
     }
     GetProtocolTypeColumn() {
         const this$ = this;
@@ -794,25 +825,31 @@ class ArcTable {
     }
     GetComponentColumns() {
         const this$ = this;
-        return (0, Array_js_1.map)((h_1) => this$.GetColumnByHeader(h_1), (0, Seq_js_1.toArray)((0, Seq_js_1.filter)((h) => h.isComponent, this$.Headers)));
+        return (0, Collections_js_1.ResizeArray_choose)((h) => {
+            if (h.isComponent) {
+                return this$.GetColumnByHeader(h);
+            }
+            else {
+                return undefined;
+            }
+        }, this$.Headers);
+    }
+    RescanValueMap() {
+        const this$ = this;
+        this$._values.RescanValueMap();
     }
     static SplitByColumnValues(columnIndex) {
-        return (table) => (0, Array_js_1.mapIndexed)((i, indexGroup) => {
-            let headers;
-            const collection = table.Headers;
-            headers = Array.from(collection);
-            const rows = (0, Array_js_1.map)((i_1) => table.GetRow(i_1, true), indexGroup);
+        return (table) => (0, Collections_js_1.ResizeArray_mapi)((i, indexGroup) => {
+            const headers = table.Headers;
+            const rows = (0, Collections_js_1.ResizeArray_map)((i_1) => table.GetRow(i_1, true), indexGroup);
             return ArcTable.createFromRows(table.Name, headers, rows);
-        }, (0, Array_js_1.map)((tupledArg) => (0, Array_js_1.map)((tuple_1) => tuple_1[0], tupledArg[1]), (0, Seq2_js_1.Array_groupBy)((tuple) => tuple[1], (0, Array_js_1.indexed)(table.GetColumn(columnIndex).Cells), {
-            Equals: Util_js_1.equals,
-            GetHashCode: Util_js_1.safeHash,
-        })));
+        }, (0, Collections_js_1.ResizeArray_map)((tupledArg) => (0, Collections_js_1.ResizeArray_map)((tuple_1) => tuple_1[0], tupledArg[1]), (0, Collections_js_1.ResizeArray_groupBy)((tuple) => tuple[1], (0, Collections_js_1.ResizeArray_indexed)(table.GetColumn(columnIndex, true).Cells))));
     }
     static SplitByColumnValuesByHeader(header) {
         return (table) => {
             const index = (0, Seq_js_1.tryFindIndex)((x) => (0, Util_js_1.equals)(x, header), table.Headers);
             if (index == null) {
-                return [table.Copy()];
+                return (0, Collections_js_1.ResizeArray_singleton)(table.Copy());
             }
             else {
                 const i = (0, Option_js_1.value)(index) | 0;
@@ -835,18 +872,23 @@ class ArcTable {
             }
         }, (0, Seq_js_1.indexed)(refTable_1.Headers)));
         refTable_1.RemoveColumns(nonProtocolColumns);
-        (0, ArcTableAux_js_1.Unchecked_extendToRowCount)(annotationTable_1.RowCount, refTable_1.Headers, refTable_1.Values);
-        const arr = annotationTable_1.Columns;
-        for (let idx = 0; idx <= (arr.length - 1); idx++) {
-            const c = (0, Array_js_1.item)(idx, arr);
-            refTable_1.AddColumn(c.Header, c.Cells, undefined, true);
+        refTable_1.RowCount = (annotationTable_1.RowCount | 0);
+        let enumerator = (0, Util_js_1.getEnumerator)(annotationTable_1.Columns);
+        try {
+            while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
+                const c = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
+                refTable_1.AddColumn(c.Header, c.Cells, undefined, true);
+            }
+        }
+        finally {
+            (0, Util_js_1.disposeSafe)(enumerator);
         }
         return refTable_1;
     }
     static append(table1, table2) {
-        const getList = (t) => (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((row) => (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((col) => [t.Headers[col], (0, MapUtil_js_1.getItemFromDict)(t.Values, [col, row])], (0, Range_js_1.rangeDouble)(0, 1, t.ColumnCount - 1)))), (0, Range_js_1.rangeDouble)(0, 1, t.RowCount - 1))));
+        const getList = (t) => (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((row) => (0, Seq_js_1.toList)((0, Seq_js_1.mapIndexed)((i, c) => [t.Headers[i], c], t.GetRow(row, true))), (0, Range_js_1.rangeDouble)(0, 1, t.RowCount - 1))));
         const patternInput = (0, ArcTableAux_js_1.Unchecked_alignByHeaders)(false, (0, List_js_1.append)(getList(table1), getList(table2)));
-        return ArcTable.create(table1.Name, patternInput[0], patternInput[1]);
+        return ArcTable.fromArcTableValues(table1.Name, patternInput[0], patternInput[1]);
     }
     toString() {
         const this$ = this;
@@ -854,33 +896,8 @@ class ArcTable {
         return (0, String_js_1.join)("\n", (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)(`Table: ${this$.Name}`), (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)("-------------"), (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)((0, String_js_1.join)("\t|\t", (0, Seq_js_1.map)(Types_js_1.toString, this$.Headers))), (0, Seq_js_1.delay)(() => ((rowCount > 50) ? (0, Seq_js_1.append)((0, Seq_js_1.map)((rowI) => (0, String_js_1.join)("\t|\t", (0, Seq_js_1.map)(Types_js_1.toString, this$.GetRow(rowI))), (0, Range_js_1.rangeDouble)(0, 1, 19)), (0, Seq_js_1.delay)(() => (0, Seq_js_1.append)((0, Seq_js_1.singleton)("..."), (0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((rowI_1) => (0, String_js_1.join)("\t|\t", (0, Seq_js_1.map)(Types_js_1.toString, this$.GetRow(rowI_1))), (0, Range_js_1.rangeDouble)(rowCount - 20, 1, rowCount - 1)))))) : ((rowCount === 0) ? (0, Seq_js_1.singleton)("No rows") : (0, Seq_js_1.map)((rowI_2) => (0, String_js_1.join)("\t|\t", (0, Seq_js_1.map)(Types_js_1.toString, this$.GetRow(rowI_2))), (0, Range_js_1.rangeDouble)(0, 1, rowCount - 1)))))))))))));
     }
     StructurallyEquals(other) {
-        let a, b;
         const this$ = this;
-        const sort = (arg) => (0, Array_js_1.sortBy)((_arg) => _arg[0], Array.from(arg), {
-            Compare: Util_js_1.compareArrays,
-        });
-        if ((this$.Name === other.Name) && ((a = this$.Headers, (b = other.Headers, ((0, Seq_js_1.length)(a) === (0, Seq_js_1.length)(b)) && (0, Seq_js_1.fold)((acc, e) => {
-            if (acc) {
-                return e;
-            }
-            else {
-                return false;
-            }
-        }, true, (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i) => (0, Util_js_1.equals)((0, Seq_js_1.item)(i, a), (0, Seq_js_1.item)(i, b)), (0, Range_js_1.rangeDouble)(0, 1, (0, Seq_js_1.length)(a) - 1))))))))) {
-            const a_1 = sort(this$.Values);
-            const b_1 = sort(other.Values);
-            return ((0, Seq_js_1.length)(a_1) === (0, Seq_js_1.length)(b_1)) && (0, Seq_js_1.fold)((acc_1, e_1) => {
-                if (acc_1) {
-                    return e_1;
-                }
-                else {
-                    return false;
-                }
-            }, true, (0, Seq_js_1.toList)((0, Seq_js_1.delay)(() => (0, Seq_js_1.map)((i_1) => (0, Util_js_1.equals)((0, Seq_js_1.item)(i_1, a_1), (0, Seq_js_1.item)(i_1, b_1)), (0, Range_js_1.rangeDouble)(0, 1, (0, Seq_js_1.length)(a_1) - 1)))));
-        }
-        else {
-            return false;
-        }
+        return (0, Util_js_1.safeHash)(this$) === (0, Util_js_1.safeHash)(other);
     }
     ReferenceEquals(other) {
         const this$ = this;
@@ -893,7 +910,7 @@ class ArcTable {
     }
     GetHashCode() {
         const this$ = this;
-        const vHash = (0, ArcTableAux_js_1.boxHashValues)(this$.ColumnCount, this$.Values);
+        const vHash = (0, Util_js_1.safeHash)(this$._values) | 0;
         return (0, HashCodes_js_1.boxHashArray)([this$.Name, (0, HashCodes_js_1.boxHashSeq)(this$.Headers), vHash]) | 0;
     }
 }
@@ -901,6 +918,6 @@ exports.ArcTable = ArcTable;
 function ArcTable_$reflection() {
     return (0, Reflection_js_1.class_type)("ARCtrl.ArcTable", undefined, ArcTable);
 }
-function ArcTable_$ctor_76CAD84E(name, headers, values) {
-    return new ArcTable(name, headers, values);
+function ArcTable_$ctor_2D310C9B(name, headers, columns) {
+    return new ArcTable(name, headers, columns);
 }