@nfdi4plants/arctrl 2.0.0-alpha.3 → 2.0.0-alpha.5

package/Core/Data.js

@@ -0,0 +1,119 @@
+import { defaultArg, unwrap } from "../fable_modules/fable-library-js.4.16.0/Option.js";
+import { ResizeArray_map } from "./Helper/Collections.js";
+import { hash, boxHashSeq, boxHashOption, boxHashArray } from "./Helper/HashCodes.js";
+import { toString } from "../fable_modules/fable-library-js.4.16.0/Types.js";
+import { printf, toText } from "../fable_modules/fable-library-js.4.16.0/String.js";
+import { DataFile__get_AsString } from "./DataFile.js";
+import { class_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
+
+export class Data {
+    constructor(id, name, dataType, format, selectorFormat, comments) {
+        this._id = id;
+        this._name = name;
+        this._dataType = dataType;
+        this._format = format;
+        this._selectorFormat = selectorFormat;
+        this._comments = defaultArg(comments, []);
+    }
+    get ID() {
+        const this$ = this;
+        return unwrap(this$._id);
+    }
+    set ID(id) {
+        const this$ = this;
+        this$._id = id;
+    }
+    get Name() {
+        const this$ = this;
+        return unwrap(this$._name);
+    }
+    set Name(name) {
+        const this$ = this;
+        this$._name = name;
+    }
+    get DataType() {
+        const this$ = this;
+        return unwrap(this$._dataType);
+    }
+    set DataType(dataType) {
+        const this$ = this;
+        this$._dataType = dataType;
+    }
+    get Format() {
+        const this$ = this;
+        return unwrap(this$._format);
+    }
+    set Format(format) {
+        const this$ = this;
+        this$._format = format;
+    }
+    get SelectorFormat() {
+        const this$ = this;
+        return unwrap(this$._selectorFormat);
+    }
+    set SelectorFormat(selectorFormat) {
+        const this$ = this;
+        this$._selectorFormat = selectorFormat;
+    }
+    get Comments() {
+        const this$ = this;
+        return this$._comments;
+    }
+    set Comments(comments) {
+        const this$ = this;
+        this$._comments = comments;
+    }
+    static make(id, name, dataType, format, selectorFormat, comments) {
+        return new Data(unwrap(id), unwrap(name), unwrap(dataType), unwrap(format), unwrap(selectorFormat), unwrap(comments));
+    }
+    static create(Id, Name, DataType, Format, SelectorFormat, Comments) {
+        return Data.make(Id, Name, DataType, Format, SelectorFormat, Comments);
+    }
+    static get empty() {
+        return Data.create();
+    }
+    get NameText() {
+        const this$ = this;
+        return defaultArg(this$.Name, "");
+    }
+    Copy() {
+        const this$ = this;
+        const nextComments = ResizeArray_map((c) => c.Copy(), this$.Comments);
+        return new Data(unwrap(this$.ID), unwrap(this$.Name), unwrap(this$.DataType), unwrap(this$.Format), unwrap(this$.SelectorFormat), nextComments);
+    }
+    GetHashCode() {
+        const this$ = this;
+        return boxHashArray([boxHashOption(this$.ID), boxHashOption(this$.Name), boxHashOption(this$.DataType), boxHashOption(this$.Format), boxHashOption(this$.SelectorFormat), boxHashSeq(this$.Comments)]) | 0;
+    }
+    Equals(obj) {
+        const this$ = this;
+        return hash(this$) === hash(obj);
+    }
+    Print() {
+        const this$ = this;
+        return toString(this$);
+    }
+    PrintCompact() {
+        const this$ = this;
+        const matchValue = this$.DataType;
+        if (matchValue == null) {
+            const arg_2 = this$.NameText;
+            return toText(printf("%s"))(arg_2);
+        }
+        else {
+            const t = matchValue;
+            const arg = this$.NameText;
+            const arg_1 = DataFile__get_AsString(t);
+            return toText(printf("%s [%s]"))(arg)(arg_1);
+        }
+    }
+}
+
+export function Data_$reflection() {
+    return class_type("ARCtrl.Data", void 0, Data);
+}
+
+export function Data_$ctor_5909441C(id, name, dataType, format, selectorFormat, comments) {
+    return new Data(id, name, dataType, format, selectorFormat, comments);
+}
+

package/Core/{Process/DataFile.js → DataFile.js}

@@ -1,5 +1,5 @@
-import { Union } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
-import { union_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { Union } from "../fable_modules/fable-library-js.4.16.0/Types.js";
+import { union_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
 
 export class DataFile extends Union {
     constructor(tag, fields) {
@@ -13,7 +13,7 @@ export class DataFile extends Union {
 }
 
 export function DataFile_$reflection() {
-    return union_type("ARCtrl.Process.DataFile", [], DataFile, () => [[], [], []]);
+    return union_type("ARCtrl.DataFile", [], DataFile, () => [[], [], []]);
 }
 
 export function DataFile_get_RawDataFileJson() {

package/Core/Helper/Identifier.js

@@ -89,6 +89,26 @@ export function Assay_tryFileNameFromIdentifier(identifier) {
     }
 }
 
+/**
+ * On writing a xlsx file we unify our output to a relative path to ARC root. So: `assays/assayIdentifier/isa.datamap.xlsx`.
+ */
+export function Assay_datamapFileNameFromIdentifier(identifier) {
+    checkValidCharacters(identifier);
+    return combineMany(["assays", identifier, "isa.datamap.xlsx"]);
+}
+
+/**
+ * On writing a xlsx file we unify our output to a relative path to ARC root. So: `assays/assayIdentifier/isa.datamap.xlsx`.
+ */
+export function Assay_tryDatamapFileNameFromIdentifier(identifier) {
+    if (tryCheckValidCharacters(identifier)) {
+        return combineMany(["assays", identifier, "isa.datamap.xlsx"]);
+    }
+    else {
+        return void 0;
+    }
+}
+
 /**
  * On read-in the FileName can be any combination of "studies" (study folder name), studyIdentifier and "isa.study.xlsx" (the actual file name).
  * 
@@ -141,3 +161,23 @@ export function Study_tryFileNameFromIdentifier(identifier) {
     }
 }
 
+/**
+ * On writing a xlsx file we unify our output to a relative path to ARC root. So: `studies/studyIdentifier/isa.investigation.xlsx`.
+ */
+export function Study_datamapFileNameFromIdentifier(identifier) {
+    checkValidCharacters(identifier);
+    return combineMany(["studies", identifier, "isa.datamap.xlsx"]);
+}
+
+/**
+ * On writing a xlsx file we unify our output to a relative path to ARC root. So: `studies/studyIdentifier/isa.investigation.xlsx`.
+ */
+export function Study_tryDatamapFileNameFromIdentifier(identifier) {
+    if (tryCheckValidCharacters(identifier)) {
+        return combineMany(["studies", identifier, "isa.datamap.xlsx"]);
+    }
+    else {
+        return void 0;
+    }
+}
+

package/Core/Helper/Regex.js

@@ -20,6 +20,8 @@ export const Pattern_InputPattern = `Input\\s\\[(?<${"iotype"}>.+)\\]`;
 
 export const Pattern_OutputPattern = `Output\\s\\[(?<${"iotype"}>.+)\\]`;
 
+export const Pattern_CommentPattern = `Comment\\s\\[(?<${"commentKey"}>.+)\\]`;
+
 /**
  * Matches, if the input string matches the given regex pattern.
  */
@@ -324,6 +326,17 @@ export function ActivePatterns_$007CAutoGeneratedTableName$007C_$007C(input) {
     }
 }
 
+export function ActivePatterns_$007CComment$007C_$007C(input) {
+    const activePatternResult = ActivePatterns_$007CRegex$007C_$007C(Pattern_CommentPattern, input);
+    if (activePatternResult != null) {
+        const r = activePatternResult;
+        return (r.groups && r.groups.commentKey) || "";
+    }
+    else {
+        return void 0;
+    }
+}
+
 export function tryParseReferenceColumnHeader(str) {
     const matchValue = str.trim();
     const activePatternResult = ActivePatterns_$007CReferenceColumnHeader$007C_$007C(matchValue);

package/Core/OntologyAnnotation.js

@@ -4,8 +4,9 @@ import { StringBuilder__Append_Z721C83C5, StringBuilder_$ctor } from "../fable_m
 import { printf, toText, join } from "../fable_modules/fable-library-js.4.16.0/String.js";
 import { toArray, empty, singleton, append, delay, toList } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { toString } from "../fable_modules/fable-library-js.4.16.0/Types.js";
-import { hash, boxHashOption, boxHashArray } from "./Helper/HashCodes.js";
+import { hash as hash_1, boxHashOption, boxHashArray } from "./Helper/HashCodes.js";
 import { ResizeArray_map } from "./Helper/Collections.js";
+import { safeHash } from "../fable_modules/fable-library-js.4.16.0/Util.js";
 import { class_type } from "../fable_modules/fable-library-js.4.16.0/Reflection.js";
 
 export class OntologyAnnotation {
@@ -67,10 +68,15 @@ export class OntologyAnnotation {
         return `${"http://purl.obolibrary.org/obo/"}${termSourceRef}_${localTAN}`;
     }
     static fromTermAnnotation(tan, name) {
-        const name_1 = defaultArg(name, "");
-        const r = value_4(tryParseTermAnnotation(tan));
-        const accession = (r.IDSpace + ":") + r.LocalID;
-        return OntologyAnnotation.create(name_1, r.IDSpace, accession);
+        const matchValue = tryParseTermAnnotation(tan);
+        if (matchValue == null) {
+            return OntologyAnnotation.create(name, void 0, tan);
+        }
+        else {
+            const r = matchValue;
+            const accession = (r.IDSpace + ":") + r.LocalID;
+            return OntologyAnnotation.create(name, r.IDSpace, accession);
+        }
     }
     get TermAccessionShort() {
         const this$ = this;
@@ -136,6 +142,10 @@ export class OntologyAnnotation {
         StringBuilder__Append_Z721C83C5(sb, "}");
         return toString(sb);
     }
+    isEmpty() {
+        const this$ = this;
+        return (((this$.Name == null) && (this$.TermSourceREF == null)) && (this$.TermAccessionNumber == null)) && (this$.Comments.length === 0);
+    }
     GetHashCode() {
         const this$ = this;
         return boxHashArray(toArray(delay(() => append(singleton(boxHashOption(this$.Name)), delay(() => {
@@ -157,7 +167,7 @@ export class OntologyAnnotation {
     }
     Equals(obj) {
         const this$ = this;
-        return hash(this$) === hash(obj);
+        return hash_1(this$) === hash_1(obj);
     }
     Copy() {
         const this$ = this;
@@ -175,6 +185,18 @@ export class OntologyAnnotation {
         const this$ = this;
         return "OA " + this$.NameText;
     }
+    CompareTo(obj) {
+        const this$ = this;
+        if (obj instanceof OntologyAnnotation) {
+            const oa = obj;
+            const hash = safeHash(this$) | 0;
+            const otherHash = safeHash(oa) | 0;
+            return ((hash === otherHash) ? 0 : ((hash < otherHash) ? -1 : 1)) | 0;
+        }
+        else {
+            return 1;
+        }
+    }
 }
 
 export function OntologyAnnotation_$reflection() {

package/Core/Process/ColumnIndex.js

@@ -1,9 +1,10 @@
 import { tryParse } from "../../fable_modules/fable-library-js.4.16.0/Int32.js";
 import { FSharpRef } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
 import { Comment$ } from "../Comment.js";
-import { int32ToString } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
-import { value, bind } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { equals, int32ToString } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
 import { tryItem } from "../CommentList.js";
+import { findIndex } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { value, bind } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { Factor } from "./Factor.js";
 import { MaterialAttribute_fromString_5980DC03 } from "./MaterialAttribute.js";
 import { ProtocolParameter } from "./ProtocolParameter.js";
@@ -30,7 +31,16 @@ export function createOrderComment(index) {
 }
 
 export function tryGetIndex(comments) {
-    return bind(tryInt, tryItem(orderName, comments));
+    const matchValue = tryItem(orderName, comments);
+    if (matchValue != null) {
+        const ci = matchValue;
+        const i = findIndex((c) => equals(c.Name, orderName), comments) | 0;
+        comments.splice(i, 1);
+        return tryInt(ci);
+    }
+    else {
+        return void 0;
+    }
 }
 
 export function setOntologyAnnotationIndexInplace(i, oa) {

package/Core/Process/ProcessInput.js

@@ -2,12 +2,12 @@ import { Union, toString } from "../../fable_modules/fable-library-js.4.16.0/Typ
 import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { Source_create_Z5CA08497, Source_getUnits_53E41069, Source_setCharacteristicValues, Source_get_empty, Source_$reflection } from "./Source.js";
 import { Sample_create_62424AD2, Sample_getUnits_53716792, Sample_setCharacteristicValues, Sample_$reflection } from "./Sample.js";
-import { Data_create_Z2AF98BBE, Data_$reflection } from "./Data.js";
+import { Data, Data_$reflection } from "../Data.js";
 import { Material_create_Z66909A6D, Material_getUnits_ZBCDEB61, Material_setCharacteristicValues, Material_$reflection } from "./Material.js";
 import { union_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { unwrap, map, defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { empty, choose } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { DataFile } from "./DataFile.js";
+import { DataFile } from "../DataFile.js";
 
 export class ProcessInput extends Union {
     constructor(tag, fields) {
@@ -284,14 +284,14 @@ export function ProcessInput_createMaterial_4452CB4C(name, characteristics, deri
 }
 
 export function ProcessInput_createImageFile_Z721C83C5(name) {
-    return new ProcessInput(2, [Data_create_Z2AF98BBE(void 0, name, new DataFile(2, []))]);
+    return new ProcessInput(2, [Data.create(void 0, name, new DataFile(2, []))]);
 }
 
 export function ProcessInput_createRawData_Z721C83C5(name) {
-    return new ProcessInput(2, [Data_create_Z2AF98BBE(void 0, name, new DataFile(0, []))]);
+    return new ProcessInput(2, [Data.create(void 0, name, new DataFile(0, []))]);
 }
 
 export function ProcessInput_createDerivedData_Z721C83C5(name) {
-    return new ProcessInput(2, [Data_create_Z2AF98BBE(void 0, name, new DataFile(1, []))]);
+    return new ProcessInput(2, [Data.create(void 0, name, new DataFile(1, []))]);
 }
 

package/Core/Process/ProcessOutput.js

@@ -1,12 +1,12 @@
 import { Union, toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
 import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { Sample_create_62424AD2, Sample_getUnits_53716792, Sample_setFactorValues, Sample_get_empty, Sample_$reflection } from "./Sample.js";
-import { Data_create_Z2AF98BBE, Data_$reflection } from "./Data.js";
+import { Data, Data_$reflection } from "../Data.js";
 import { Material_create_Z66909A6D, Material_getUnits_ZBCDEB61, Material_$reflection } from "./Material.js";
 import { union_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { unwrap, map, defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { empty, choose } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { DataFile } from "./DataFile.js";
+import { DataFile } from "../DataFile.js";
 
 export class ProcessOutput extends Union {
     constructor(tag, fields) {
@@ -250,14 +250,14 @@ export function ProcessOutput_createMaterial_4452CB4C(name, characteristics, der
 }
 
 export function ProcessOutput_createImageFile_Z721C83C5(name) {
-    return new ProcessOutput(1, [Data_create_Z2AF98BBE(void 0, name, new DataFile(2, []))]);
+    return new ProcessOutput(1, [Data.create(void 0, name, new DataFile(2, []))]);
 }
 
 export function ProcessOutput_createRawData_Z721C83C5(name) {
-    return new ProcessOutput(1, [Data_create_Z2AF98BBE(void 0, name, new DataFile(0, []))]);
+    return new ProcessOutput(1, [Data.create(void 0, name, new DataFile(0, []))]);
 }
 
 export function ProcessOutput_createDerivedData_Z721C83C5(name) {
-    return new ProcessOutput(1, [Data_create_Z2AF98BBE(void 0, name, new DataFile(1, []))]);
+    return new ProcessOutput(1, [Data.create(void 0, name, new DataFile(1, []))]);
 }
 

package/Core/Process/Value.js

@@ -31,7 +31,7 @@ export class Value extends Union {
             matchValue_1 = [tryParse_1(value, new FSharpRef(() => outArg_1, (v_2) => {
                 outArg_1 = v_2;
             })), outArg_1];
-            return matchValue_1[0] ? (new Value(2, [matchValue_1[1]])) : (new Value(0, [OntologyAnnotation.create(value)]));
+            return matchValue_1[0] ? (new Value(2, [matchValue_1[1]])) : (new Value(3, [value]));
         }
     }
     static fromOptions(value, termSource, termAccesssion) {

package/Core/Table/ArcTable.js

@@ -1,4 +1,4 @@
-import { boxHashValues, Unchecked_alignByHeaders, Unchecked_extendToRowCount, Unchecked_removeRowCells_withIndexChange, Unchecked_addRows, Unchecked_addRow, Unchecked_getEmptyCellForHeader, Unchecked_removeColumnCells_withIndexChange, tryFindDuplicateUniqueInArray, Unchecked_removeColumnCells, Unchecked_removeHeader, Unchecked_fillMissingCells, Unchecked_addColumn, tryFindDuplicateUnique, Unchecked_setCellAt, SanityChecks_validateColumn, SanityChecks_validateRowIndex, SanityChecks_validateColumnIndex, Unchecked_tryGetCellAt, getRowCount, getColumnCount, SanityChecks_validate } from "./ArcTableAux.js";
+import { boxHashValues, Unchecked_alignByHeaders, Unchecked_extendToRowCount, Unchecked_removeRowCells_withIndexChange, Unchecked_addRows, Unchecked_addRow, Unchecked_getEmptyCellForHeader, Unchecked_moveColumnTo, Unchecked_removeColumnCells_withIndexChange, tryFindDuplicateUniqueInArray, Unchecked_removeColumnCells, Unchecked_removeHeader, Unchecked_fillMissingCells, Unchecked_addColumn, tryFindDuplicateUnique, Unchecked_setCellAt, SanityChecks_validateColumn, SanityChecks_validateRowIndex, SanityChecks_validateColumnIndex, Unchecked_tryGetCellAt, getRowCount, getColumnCount, SanityChecks_validate } from "./ArcTableAux.js";
 import { Dictionary } from "../../fable_modules/fable-library-js.4.16.0/MutableMap.js";
 import { compareArrays, safeHash, comparePrimitives, equals, arrayHash, equalArrays } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
 import { value as value_3, map as map_2, unwrap, defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
@@ -398,6 +398,27 @@ export class ArcTable {
     static getOutputColumn() {
         return (table) => table.GetOutputColumn();
     }
+    MoveColumn(startCol, endCol) {
+        const this$ = this;
+        if (startCol === endCol) {
+        }
+        else if ((startCol < 0) ? true : (startCol >= this$.ColumnCount)) {
+            toFail(printf("Cannt move column. Invalid start column index: %i"))(startCol);
+        }
+        else if ((endCol < 0) ? true : (endCol >= this$.ColumnCount)) {
+            toFail(printf("Cannt move column. Invalid end column index: %i"))(endCol);
+        }
+        else {
+            Unchecked_moveColumnTo(this$.RowCount, startCol, endCol, this$.Headers, this$.Values);
+        }
+    }
+    static moveColumn(startCol, endCol) {
+        return (table) => {
+            const newTable = table.Copy();
+            newTable.MoveColumn(startCol, endCol);
+            return newTable;
+        };
+    }
     AddRow(cells, index) {
         const this$ = this;
         const index_1 = defaultArg(index, this$.RowCount) | 0;
@@ -713,7 +734,8 @@ export class ArcTable {
     }
     toString() {
         const this$ = this;
-        return join("\n", toList(delay(() => append_1(singleton(`Table: ${this$.Name}`), delay(() => append_1(singleton("-------------"), delay(() => append_1(singleton(join("\t|\t", map(toString, this$.Headers))), delay(() => map((rowI) => join("\t|\t", map(toString, this$.GetRow(rowI))), rangeDouble(0, 1, this$.RowCount - 1)))))))))));
+        const rowCount = this$.RowCount | 0;
+        return join("\n", toList(delay(() => append_1(singleton(`Table: ${this$.Name}`), delay(() => append_1(singleton("-------------"), delay(() => append_1(singleton(join("\t|\t", map(toString, this$.Headers))), delay(() => ((rowCount > 50) ? append_1(map((rowI) => join("\t|\t", map(toString, this$.GetRow(rowI))), rangeDouble(0, 1, 19)), delay(() => append_1(singleton("..."), delay(() => map((rowI_1) => join("\t|\t", map(toString, this$.GetRow(rowI_1))), rangeDouble(rowCount - 20, 1, rowCount - 1)))))) : ((rowCount === 0) ? singleton("No rows") : map((rowI_2) => join("\t|\t", map(toString, this$.GetRow(rowI_2))), rangeDouble(0, 1, rowCount - 1)))))))))))));
     }
     StructurallyEquals(other) {
         let a, b;

package/Core/Table/ArcTableAux.js

@@ -1,4 +1,4 @@
-import { head as head_1, toArray, filter, tryFindIndex, maxBy } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { toList, head as head_1, toArray, filter, tryFindIndex, maxBy } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { arrayHash, equalArrays, numberHash, disposeSafe, getEnumerator, compare, equals, safeHash, comparePrimitives } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
 import { addToDict, getItemFromDict } from "../../fable_modules/fable-library-js.4.16.0/MapUtil.js";
 import { value as value_2 } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
@@ -7,11 +7,13 @@ import { printf, toConsole } from "../../fable_modules/fable-library-js.4.16.0/S
 import { List_tryPickAndRemove, Dictionary_tryFind } from "../Helper/Collections.js";
 import { CompositeCell } from "./CompositeCell.js";
 import { max } from "../../fable_modules/fable-library-js.4.16.0/Double.js";
-import { item, map, iterateIndexed } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
+import { setItem, item, map, iterateIndexed } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
 import { tryFind, ofArray } from "../../fable_modules/fable-library-js.4.16.0/Map.js";
 import { Array_groupBy } from "../../fable_modules/fable-library-js.4.16.0/Seq2.js";
 import { FSharpSet__Contains, ofArray as ofArray_1 } from "../../fable_modules/fable-library-js.4.16.0/Set.js";
 import { toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
+import { rangeDouble } from "../../fable_modules/fable-library-js.4.16.0/Range.js";
+import { op_UnaryNegation_Int32 } from "../../fable_modules/fable-library-js.4.16.0/Int32.js";
 import { Dictionary } from "../../fable_modules/fable-library-js.4.16.0/MutableMap.js";
 
 export function getColumnCount(headers) {
@@ -151,7 +153,7 @@ export function SanityChecks_validateColumn(column) {
 }
 
 export function SanityChecks_validate(headers, values, raiseException) {
-    let clo;
+    let clo, clo_1;
     let isValid = true;
     let en = getEnumerator(values);
     while (isValid && en["System.Collections.IEnumerator.MoveNext"]()) {
@@ -162,12 +164,23 @@ export function SanityChecks_validate(headers, values, raiseException) {
         let copyOfStruct_1 = en["System.Collections.Generic.IEnumerator`1.get_Current"]();
         cell = copyOfStruct_1[1];
         const header = headers[matchValue[0]];
-        if (!header.IsTermColumn && !cell.isFreeText) {
+        const headerIsData = header.IsDataColumn;
+        const headerIsFreetext = !header.IsTermColumn && !header.IsDataColumn;
+        const cellIsNotFreetext = !cell.isFreeText;
+        if (headerIsData && (!cell.isData && cellIsNotFreetext)) {
             (raiseException ? ((message) => {
                 throw new Error(message);
             }) : ((clo = toConsole(printf("%s")), (arg) => {
                 clo(arg);
-            })))(`Invalid combination of header \`${header}\` and cell \`${cell}\`.`);
+            })))(`Invalid combination of header \`${header}\` and cell \`${cell}\`. Data header should contain either Data or Freetext cells.`);
+            isValid = false;
+        }
+        if (headerIsFreetext && cellIsNotFreetext) {
+            (raiseException ? ((message_1) => {
+                throw new Error(message_1);
+            }) : ((clo_1 = toConsole(printf("%s")), (arg_1) => {
+                clo_1(arg_1);
+            })))(`Invalid combination of header \`${header}\` and cell \`${cell}\`. Freetext header should not contain non-freetext cells.`);
             isValid = false;
         }
     }
@@ -461,6 +474,44 @@ export function Unchecked_compositeHeaderMainColumnEqual(ch1, ch2) {
     return toString(ch1) === toString(ch2);
 }
 
+/**
+ * Moves a column from one position to another
+ * 
+ * This function moves the column from `fromCol` to `toCol` and shifts all columns in between accordingly
+ */
+export function Unchecked_moveColumnTo(rowCount, fromCol, toCol, headers, values) {
+    const patternInput = (fromCol < toCol) ? [-1, fromCol + 1, toCol] : [1, fromCol - 1, toCol];
+    const shiftStart = patternInput[1] | 0;
+    const shiftEnd = patternInput[2] | 0;
+    const shift = patternInput[0] | 0;
+    const header = headers[fromCol];
+    const enumerator = getEnumerator(toList(rangeDouble(shiftStart, op_UnaryNegation_Int32(shift), shiftEnd)));
+    try {
+        while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
+            const c = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]() | 0;
+            setItem(headers, c + shift, headers[c]);
+        }
+    }
+    finally {
+        disposeSafe(enumerator);
+    }
+    setItem(headers, toCol, header);
+    for (let r = 0; r <= (rowCount - 1); r++) {
+        const cell = getItemFromDict(values, [fromCol, r]);
+        const enumerator_1 = getEnumerator(toList(rangeDouble(shiftStart, op_UnaryNegation_Int32(shift), shiftEnd)));
+        try {
+            while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
+                const c_1 = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]() | 0;
+                values.set([c_1 + shift, r], getItemFromDict(values, [c_1, r]));
+            }
+        }
+        finally {
+            disposeSafe(enumerator_1);
+        }
+        values.set([toCol, r], cell);
+    }
+}
+
 /**
  * From a list of rows consisting of headers and values, creates a list of combined headers and the values as a sparse matrix
  * 

package/Core/Table/ArcTables.js

@@ -199,7 +199,7 @@ export function ArcTablesAux_SanityChecks_validateNewNamesUnique(newNames, exist
 
 export class ArcTables {
     constructor(initTables) {
-        this.tables = initTables;
+        this.tables = ((ArcTablesAux_SanityChecks_validateNamesUnique(map_1((t) => t.Name, initTables)), initTables));
     }
     get Tables() {
         const this$ = this;