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

package/Core/Table/CompositeCell.js

@@ -1,5 +1,6 @@
 import { defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { OntologyAnnotation_$reflection, OntologyAnnotation } from "../OntologyAnnotation.js";
+import { Data_$reflection, Data } from "../Data.js";
 import { Union } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
 import { union_type, string_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 
@@ -10,7 +11,7 @@ export class CompositeCell extends Union {
         this.fields = fields;
     }
     cases() {
-        return ["Term", "FreeText", "Unitized"];
+        return ["Term", "FreeText", "Unitized", "Data"];
     }
     get isUnitized() {
         const this$ = this;
@@ -24,9 +25,13 @@ export class CompositeCell extends Union {
         const this$ = this;
         return this$.tag === 1;
     }
+    get isData() {
+        const this$ = this;
+        return this$.tag === 3;
+    }
     GetEmptyCell() {
         const this$ = this;
-        return (this$.tag === 2) ? CompositeCell.emptyUnitized : ((this$.tag === 1) ? CompositeCell.emptyFreeText : CompositeCell.emptyTerm);
+        return (this$.tag === 2) ? CompositeCell.emptyUnitized : ((this$.tag === 1) ? CompositeCell.emptyFreeText : ((this$.tag === 3) ? CompositeCell.emptyData : CompositeCell.emptyTerm));
     }
     GetContent() {
         const this$ = this;
@@ -39,21 +44,43 @@ export class CompositeCell extends Union {
                 const oa_1 = this$.fields[1];
                 return [this$.fields[0], oa_1.NameText, defaultArg(oa_1.TermSourceREF, ""), defaultArg(oa_1.TermAccessionNumber, "")];
             }
+            case 3: {
+                const d = this$.fields[0];
+                return [defaultArg(d.Name, ""), defaultArg(d.Format, ""), defaultArg(d.SelectorFormat, "")];
+            }
             default:
                 return [this$.fields[0]];
         }
     }
     ToUnitizedCell() {
         const this$ = this;
-        return (this$.tag === 1) ? (new CompositeCell(2, ["", OntologyAnnotation.create(this$.fields[0])])) : ((this$.tag === 0) ? (new CompositeCell(2, ["", this$.fields[0]])) : this$);
+        switch (this$.tag) {
+            case 1:
+                return new CompositeCell(2, ["", OntologyAnnotation.create(this$.fields[0])]);
+            case 0:
+                return new CompositeCell(2, ["", this$.fields[0]]);
+            case 3:
+                throw new Error("Data cell cannot be converted to Unitized cell.");
+            default:
+                return this$;
+        }
     }
     ToTermCell() {
         const this$ = this;
-        return (this$.tag === 2) ? (new CompositeCell(0, [this$.fields[1]])) : ((this$.tag === 1) ? (new CompositeCell(0, [OntologyAnnotation.create(this$.fields[0])])) : this$);
+        switch (this$.tag) {
+            case 2:
+                return new CompositeCell(0, [this$.fields[1]]);
+            case 1:
+                return new CompositeCell(0, [OntologyAnnotation.create(this$.fields[0])]);
+            case 3:
+                throw new Error("Data cell cannot be converted to Term cell.");
+            default:
+                return this$;
+        }
     }
     ToFreeTextCell() {
         const this$ = this;
-        return (this$.tag === 0) ? (new CompositeCell(1, [this$.fields[0].NameText])) : ((this$.tag === 2) ? (new CompositeCell(1, [this$.fields[1].NameText])) : this$);
+        return (this$.tag === 0) ? (new CompositeCell(1, [this$.fields[0].NameText])) : ((this$.tag === 2) ? (new CompositeCell(1, [this$.fields[1].NameText])) : ((this$.tag === 3) ? (new CompositeCell(1, [defaultArg(this$.fields[0].Name, "")])) : this$));
     }
     get AsUnitized() {
         const this$ = this;
@@ -70,7 +97,7 @@ export class CompositeCell extends Union {
             return this$.fields[0];
         }
         else {
-            throw new Error("Not a Swate TermCell.");
+            throw new Error("Not a Term Cell.");
         }
     }
     get AsFreeText() {
@@ -79,7 +106,16 @@ export class CompositeCell extends Union {
             return this$.fields[0];
         }
         else {
-            throw new Error("Not a Swate TermCell.");
+            throw new Error("Not a FreeText Cell.");
+        }
+    }
+    get AsData() {
+        const this$ = this;
+        if (this$.tag === 3) {
+            return this$.fields[0];
+        }
+        else {
+            throw new Error("Not a Data Cell.");
         }
     }
     static createTerm(oa) {
@@ -98,6 +134,12 @@ export class CompositeCell extends Union {
     static createFreeText(value) {
         return new CompositeCell(1, [value]);
     }
+    static createData(d) {
+        return new CompositeCell(3, [d]);
+    }
+    static createDataFromString(value, format, selectorFormat) {
+        return new CompositeCell(3, [Data.create(void 0, value, void 0, format, selectorFormat)]);
+    }
     static get emptyTerm() {
         return new CompositeCell(0, [new OntologyAnnotation()]);
     }
@@ -107,16 +149,28 @@ export class CompositeCell extends Union {
     static get emptyUnitized() {
         return new CompositeCell(2, ["", new OntologyAnnotation()]);
     }
+    static get emptyData() {
+        return new CompositeCell(3, [Data.create()]);
+    }
     UpdateWithOA(oa) {
         const this$ = this;
-        return (this$.tag === 2) ? CompositeCell.createUnitized(this$.fields[0], oa) : ((this$.tag === 1) ? CompositeCell.createFreeText(oa.NameText) : CompositeCell.createTerm(oa));
+        switch (this$.tag) {
+            case 2:
+                return CompositeCell.createUnitized(this$.fields[0], oa);
+            case 1:
+                return CompositeCell.createFreeText(oa.NameText);
+            case 3:
+                throw new Error("Data cell cannot be updated with OntologyAnnotation.");
+            default:
+                return CompositeCell.createTerm(oa);
+        }
     }
     static updateWithOA(oa, cell) {
         return cell.UpdateWithOA(oa);
     }
     toString() {
         const this$ = this;
-        return (this$.tag === 1) ? this$.fields[0] : ((this$.tag === 2) ? (`${this$.fields[0]} ${this$.fields[1].NameText}`) : (`${this$.fields[0].NameText}`));
+        return (this$.tag === 1) ? this$.fields[0] : ((this$.tag === 2) ? (`${this$.fields[0]} ${this$.fields[1].NameText}`) : ((this$.tag === 3) ? (`${this$.fields[0].NameText}`) : (`${this$.fields[0].NameText}`)));
     }
     static term(oa) {
         return new CompositeCell(0, [oa]);
@@ -127,9 +181,12 @@ export class CompositeCell extends Union {
     static unitized(v, oa) {
         return new CompositeCell(2, [v, oa]);
     }
+    static data(d) {
+        return new CompositeCell(3, [d]);
+    }
 }
 
 export function CompositeCell_$reflection() {
-    return union_type("ARCtrl.CompositeCell", [], CompositeCell, () => [[["Item", OntologyAnnotation_$reflection()]], [["Item", string_type]], [["Item1", string_type], ["Item2", OntologyAnnotation_$reflection()]]]);
+    return union_type("ARCtrl.CompositeCell", [], CompositeCell, () => [[["Item", OntologyAnnotation_$reflection()]], [["Item", string_type]], [["Item1", string_type], ["Item2", OntologyAnnotation_$reflection()]], [["Item", Data_$reflection()]]]);
 }
 

package/Core/Table/CompositeColumn.js

@@ -23,6 +23,15 @@ export class CompositeColumn extends Record {
         if (cells.length === 0) {
             return true;
         }
+        else if (header.IsDataColumn && (item(0, cells).isData ? true : item(0, cells).isFreeText)) {
+            return true;
+        }
+        else if (header.IsDataColumn) {
+            if (raiseExeption) {
+                throw new Error(`Invalid combination of header \`${header}\` and cells \`${item(0, cells)}\`, Data header should have either Data or Freetext cells`);
+            }
+            return false;
+        }
         else if (header.IsTermColumn && (item(0, cells).isTerm ? true : item(0, cells).isUnitized)) {
             return true;
         }

package/Core/Table/CompositeHeader.js

@@ -1,7 +1,7 @@
 import { map } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
 import { union_type, string_type, getUnionCases, name } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { Union, toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
-import { ActivePatterns_$007CTermColumn$007C_$007C, Pattern_OutputPattern, Pattern_InputPattern, ActivePatterns_$007CRegex$007C_$007C, tryParseIOTypeHeader } from "../Helper/Regex.js";
+import { ActivePatterns_$007CTermColumn$007C_$007C, Pattern_CommentPattern, Pattern_OutputPattern, Pattern_InputPattern, ActivePatterns_$007CRegex$007C_$007C, tryParseIOTypeHeader } from "../Helper/Regex.js";
 import { equals } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
 import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { OntologyAnnotation_$reflection, OntologyAnnotation } from "../OntologyAnnotation.js";
@@ -13,10 +13,10 @@ export class IOType extends Union {
         this.fields = fields;
     }
     cases() {
-        return ["Source", "Sample", "RawDataFile", "DerivedDataFile", "ImageFile", "Material", "FreeText"];
+        return ["Source", "Sample", "Data", "Material", "FreeText"];
     }
     static get All() {
-        return [new IOType(0, []), new IOType(1, []), new IOType(2, []), new IOType(3, []), new IOType(4, []), new IOType(5, [])];
+        return [new IOType(0, []), new IOType(1, []), new IOType(2, []), new IOType(3, [])];
     }
     static get Cases() {
         return map((x) => [x.tag, name(x)], getUnionCases(IOType_$reflection()));
@@ -27,7 +27,7 @@ export class IOType extends Union {
             let copyOfStruct;
             return `Input [${(copyOfStruct = x, toString(copyOfStruct))}]`;
         };
-        return (this$.tag === 6) ? stringCreate(this$.fields[0]) : stringCreate(this$);
+        return (this$.tag === 4) ? stringCreate(this$.fields[0]) : stringCreate(this$);
     }
     get asOutput() {
         const this$ = this;
@@ -35,49 +35,17 @@ export class IOType extends Union {
             let copyOfStruct;
             return `Output [${(copyOfStruct = x, toString(copyOfStruct))}]`;
         };
-        return (this$.tag === 6) ? stringCreate(this$.fields[0]) : stringCreate(this$);
+        return (this$.tag === 4) ? stringCreate(this$.fields[0]) : stringCreate(this$);
     }
     Merge(other) {
         const this$ = this;
         switch (this$.tag) {
-            case 4:
-                switch (other.tag) {
-                    case 0:
-                        return new IOType(4, []);
-                    case 2:
-                        return new IOType(4, []);
-                    case 3:
-                        return new IOType(4, []);
-                    case 4:
-                        return new IOType(4, []);
-                    default:
-                        throw new Error(`ImageFile IO column and ${other} can not be merged`);
-                }
-            case 3:
-                switch (other.tag) {
-                    case 0:
-                        return new IOType(3, []);
-                    case 2:
-                        return new IOType(3, []);
-                    case 3:
-                        return new IOType(3, []);
-                    case 4:
-                        return new IOType(4, []);
-                    default:
-                        throw new Error(`DerivedDataFile IO column and ${other} can not be merged`);
-                }
             case 2:
-                switch (other.tag) {
-                    case 0:
-                        return new IOType(2, []);
-                    case 2:
-                        return new IOType(2, []);
-                    case 3:
-                        return new IOType(3, []);
-                    case 4:
-                        return new IOType(4, []);
-                    default:
-                        throw new Error(`RawDataFile IO column and ${other} can not be merged`);
+                if (other.tag === 0) {
+                    return new IOType(2, []);
+                }
+                else {
+                    throw new Error(`Data IO column and ${other} can not be merged`);
                 }
             case 1:
                 switch (other.tag) {
@@ -90,19 +58,19 @@ export class IOType extends Union {
                 }
             case 0:
                 return (other.tag === 0) ? (new IOType(0, [])) : other;
-            case 5:
+            case 3:
                 switch (other.tag) {
                     case 0:
-                        return new IOType(5, []);
-                    case 5:
-                        return new IOType(5, []);
+                        return new IOType(3, []);
+                    case 3:
+                        return new IOType(3, []);
                     default:
                         throw new Error(`Material IO column and ${other} can not be merged`);
                 }
             default:
-                if (other.tag === 6) {
+                if (other.tag === 4) {
                     if (this$.fields[0] === other.fields[0]) {
-                        return new IOType(6, [this$.fields[0]]);
+                        return new IOType(4, [this$.fields[0]]);
                     }
                     else {
                         throw new Error(`FreeText IO column names ${this$.fields[0]} and ${other.fields[0]} do differ`);
@@ -115,10 +83,10 @@ export class IOType extends Union {
     }
     toString() {
         const this$ = this;
-        return (this$.tag === 1) ? "Sample Name" : ((this$.tag === 2) ? "Raw Data File" : ((this$.tag === 3) ? "Derived Data File" : ((this$.tag === 4) ? "Image File" : ((this$.tag === 5) ? "Material" : ((this$.tag === 6) ? this$.fields[0] : "Source Name")))));
+        return (this$.tag === 1) ? "Sample Name" : ((this$.tag === 2) ? "Data" : ((this$.tag === 3) ? "Material" : ((this$.tag === 4) ? this$.fields[0] : "Source Name")));
     }
     static ofString(str) {
-        return (str === "Source") ? (new IOType(0, [])) : ((str === "Source Name") ? (new IOType(0, [])) : ((str === "Sample") ? (new IOType(1, [])) : ((str === "Sample Name") ? (new IOType(1, [])) : ((str === "RawDataFile") ? (new IOType(2, [])) : ((str === "Raw Data File") ? (new IOType(2, [])) : ((str === "DerivedDataFile") ? (new IOType(3, [])) : ((str === "Derived Data File") ? (new IOType(3, [])) : ((str === "ImageFile") ? (new IOType(4, [])) : ((str === "Image File") ? (new IOType(4, [])) : ((str === "Material") ? (new IOType(5, [])) : (new IOType(6, [str]))))))))))));
+        return (str === "Source") ? (new IOType(0, [])) : ((str === "Source Name") ? (new IOType(0, [])) : ((str === "Sample") ? (new IOType(1, [])) : ((str === "Sample Name") ? (new IOType(1, [])) : ((str === "RawDataFile") ? (new IOType(2, [])) : ((str === "Raw Data File") ? (new IOType(2, [])) : ((str === "DerivedDataFile") ? (new IOType(2, [])) : ((str === "Derived Data File") ? (new IOType(2, [])) : ((str === "ImageFile") ? (new IOType(2, [])) : ((str === "Image File") ? (new IOType(2, [])) : ((str === "Data") ? (new IOType(2, [])) : ((str === "Material") ? (new IOType(3, [])) : (new IOType(4, [str])))))))))))));
     }
     static tryOfHeaderString(str) {
         const matchValue = tryParseIOTypeHeader(str);
@@ -173,18 +141,10 @@ export class IOType extends Union {
                     break;
                 }
                 case 3: {
-                    matchResult = 3;
-                    break;
-                }
-                case 4: {
-                    matchResult = 4;
-                    break;
-                }
-                case 5: {
                     matchResult = 5;
                     break;
                 }
-                case 6: {
+                case 4: {
                     matchResult = 6;
                     break;
                 }
@@ -217,25 +177,19 @@ export class IOType extends Union {
     static sample() {
         return new IOType(1, []);
     }
-    static rawDataFile() {
+    static data() {
         return new IOType(2, []);
     }
-    static derivedDataFile() {
-        return new IOType(3, []);
-    }
-    static imageFile() {
-        return new IOType(4, []);
-    }
     static material() {
-        return new IOType(5, []);
+        return new IOType(3, []);
     }
     static freeText(s) {
-        return new IOType(6, [s]);
+        return new IOType(4, [s]);
     }
 }
 
 export function IOType_$reflection() {
-    return union_type("ARCtrl.IOType", [], IOType, () => [[], [], [], [], [], [], [["Item", string_type]]]);
+    return union_type("ARCtrl.IOType", [], IOType, () => [[], [], [], [], [["Item", string_type]]]);
 }
 
 export class CompositeHeader extends Union {
@@ -245,21 +199,21 @@ export class CompositeHeader extends Union {
         this.fields = fields;
     }
     cases() {
-        return ["Component", "Characteristic", "Factor", "Parameter", "ProtocolType", "ProtocolDescription", "ProtocolUri", "ProtocolVersion", "ProtocolREF", "Performer", "Date", "Input", "Output", "FreeText"];
+        return ["Component", "Characteristic", "Factor", "Parameter", "ProtocolType", "ProtocolDescription", "ProtocolUri", "ProtocolVersion", "ProtocolREF", "Performer", "Date", "Input", "Output", "FreeText", "Comment"];
     }
     static get Cases() {
         return map((x) => [x.tag, name(x)], getUnionCases(CompositeHeader_$reflection()));
     }
     static jsGetColumnMetaType(inp) {
-        return (inp === 0) ? 1 : ((inp === 1) ? 1 : ((inp === 2) ? 1 : ((inp === 3) ? 1 : ((inp === 4) ? 0 : ((inp === 5) ? 0 : ((inp === 6) ? 0 : ((inp === 7) ? 0 : ((inp === 8) ? 0 : ((inp === 9) ? 0 : ((inp === 10) ? 0 : ((inp === 11) ? 2 : ((inp === 12) ? 2 : ((inp === 13) ? 3 : toFail(printf("Cannot assign input `Tag` (%i) to `CompositeHeader`"))(inp))))))))))))));
+        return (inp === 0) ? 1 : ((inp === 1) ? 1 : ((inp === 2) ? 1 : ((inp === 3) ? 1 : ((inp === 4) ? 0 : ((inp === 5) ? 0 : ((inp === 6) ? 0 : ((inp === 7) ? 0 : ((inp === 8) ? 0 : ((inp === 9) ? 0 : ((inp === 10) ? 0 : ((inp === 11) ? 2 : ((inp === 12) ? 2 : ((inp === 13) ? 3 : ((inp === 14) ? 3 : toFail(printf("Cannot assign input `Tag` (%i) to `CompositeHeader`"))(inp)))))))))))))));
     }
     toString() {
         const this$ = this;
-        return (this$.tag === 2) ? (`Factor [${this$.fields[0].NameText}]`) : ((this$.tag === 1) ? (`Characteristic [${this$.fields[0].NameText}]`) : ((this$.tag === 0) ? (`Component [${this$.fields[0].NameText}]`) : ((this$.tag === 4) ? "Protocol Type" : ((this$.tag === 8) ? "Protocol REF" : ((this$.tag === 5) ? "Protocol Description" : ((this$.tag === 6) ? "Protocol Uri" : ((this$.tag === 7) ? "Protocol Version" : ((this$.tag === 9) ? "Performer" : ((this$.tag === 10) ? "Date" : ((this$.tag === 11) ? this$.fields[0].asInput : ((this$.tag === 12) ? this$.fields[0].asOutput : ((this$.tag === 13) ? this$.fields[0] : (`Parameter [${this$.fields[0].NameText}]`)))))))))))));
+        return (this$.tag === 2) ? (`Factor [${this$.fields[0].NameText}]`) : ((this$.tag === 1) ? (`Characteristic [${this$.fields[0].NameText}]`) : ((this$.tag === 0) ? (`Component [${this$.fields[0].NameText}]`) : ((this$.tag === 4) ? "Protocol Type" : ((this$.tag === 8) ? "Protocol REF" : ((this$.tag === 5) ? "Protocol Description" : ((this$.tag === 6) ? "Protocol Uri" : ((this$.tag === 7) ? "Protocol Version" : ((this$.tag === 9) ? "Performer" : ((this$.tag === 10) ? "Date" : ((this$.tag === 11) ? this$.fields[0].asInput : ((this$.tag === 12) ? this$.fields[0].asOutput : ((this$.tag === 14) ? (`Comment [${this$.fields[0]}]`) : ((this$.tag === 13) ? this$.fields[0] : (`Parameter [${this$.fields[0].NameText}]`))))))))))))));
     }
     ToTerm() {
         const this$ = this;
-        return (this$.tag === 2) ? this$.fields[0] : ((this$.tag === 1) ? this$.fields[0] : ((this$.tag === 0) ? this$.fields[0] : ((this$.tag === 4) ? OntologyAnnotation.create(toString(this$), void 0, this$.GetFeaturedColumnAccession) : ((this$.tag === 8) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 5) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 6) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 7) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 9) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 10) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 11) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 12) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 13) ? OntologyAnnotation.create(toString(this$)) : this$.fields[0]))))))))))));
+        return (this$.tag === 2) ? this$.fields[0] : ((this$.tag === 1) ? this$.fields[0] : ((this$.tag === 0) ? this$.fields[0] : ((this$.tag === 4) ? OntologyAnnotation.create(toString(this$), void 0, this$.GetFeaturedColumnAccession) : ((this$.tag === 8) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 5) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 6) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 7) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 9) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 10) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 11) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 12) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 14) ? OntologyAnnotation.create(toString(this$)) : ((this$.tag === 13) ? OntologyAnnotation.create(toString(this$)) : this$.fields[0])))))))))))));
     }
     static OfHeaderString(str) {
         const matchValue = str.trim();
@@ -277,29 +231,36 @@ export class CompositeHeader extends Union {
                 return new CompositeHeader(12, [IOType.ofString(iotype_1)]);
             }
             else {
-                const activePatternResult_2 = ActivePatterns_$007CTermColumn$007C_$007C(matchValue);
+                const activePatternResult_2 = ActivePatterns_$007CRegex$007C_$007C(Pattern_CommentPattern, matchValue);
                 if (activePatternResult_2 != null) {
                     const r_2 = activePatternResult_2;
-                    const matchValue_1 = r_2.TermColumnType;
-                    switch (matchValue_1) {
-                        case "Parameter":
-                        case "Parameter Value":
-                            return new CompositeHeader(3, [OntologyAnnotation.create(r_2.TermName)]);
-                        case "Factor":
-                        case "Factor Value":
-                            return new CompositeHeader(2, [OntologyAnnotation.create(r_2.TermName)]);
-                        case "Characteristic":
-                        case "Characteristics":
-                        case "Characteristics Value":
-                            return new CompositeHeader(1, [OntologyAnnotation.create(r_2.TermName)]);
-                        case "Component":
-                            return new CompositeHeader(0, [OntologyAnnotation.create(r_2.TermName)]);
-                        default:
-                            return new CompositeHeader(13, [str]);
-                    }
+                    return new CompositeHeader(14, [(r_2.groups && r_2.groups.commentKey) || ""]);
                 }
                 else {
-                    return (matchValue === "Date") ? (new CompositeHeader(10, [])) : ((matchValue === "Performer") ? (new CompositeHeader(9, [])) : ((matchValue === "Protocol Description") ? (new CompositeHeader(5, [])) : ((matchValue === "Protocol Uri") ? (new CompositeHeader(6, [])) : ((matchValue === "Protocol Version") ? (new CompositeHeader(7, [])) : ((matchValue === "Protocol Type") ? (new CompositeHeader(4, [])) : ((matchValue === "Protocol REF") ? (new CompositeHeader(8, [])) : (new CompositeHeader(13, [matchValue]))))))));
+                    const activePatternResult_3 = ActivePatterns_$007CTermColumn$007C_$007C(matchValue);
+                    if (activePatternResult_3 != null) {
+                        const r_3 = activePatternResult_3;
+                        const matchValue_1 = r_3.TermColumnType;
+                        switch (matchValue_1) {
+                            case "Parameter":
+                            case "Parameter Value":
+                                return new CompositeHeader(3, [OntologyAnnotation.create(r_3.TermName)]);
+                            case "Factor":
+                            case "Factor Value":
+                                return new CompositeHeader(2, [OntologyAnnotation.create(r_3.TermName)]);
+                            case "Characteristic":
+                            case "Characteristics":
+                            case "Characteristics Value":
+                                return new CompositeHeader(1, [OntologyAnnotation.create(r_3.TermName)]);
+                            case "Component":
+                                return new CompositeHeader(0, [OntologyAnnotation.create(r_3.TermName)]);
+                            default:
+                                return new CompositeHeader(13, [str]);
+                        }
+                    }
+                    else {
+                        return (matchValue === "Date") ? (new CompositeHeader(10, [])) : ((matchValue === "Performer") ? (new CompositeHeader(9, [])) : ((matchValue === "Protocol Description") ? (new CompositeHeader(5, [])) : ((matchValue === "Protocol Uri") ? (new CompositeHeader(6, [])) : ((matchValue === "Protocol Version") ? (new CompositeHeader(7, [])) : ((matchValue === "Protocol Type") ? (new CompositeHeader(4, [])) : ((matchValue === "Protocol REF") ? (new CompositeHeader(8, [])) : (new CompositeHeader(13, [matchValue]))))))));
+                    }
                 }
             }
         }
@@ -369,6 +330,42 @@ export class CompositeHeader extends Union {
                 return false;
         }
     }
+    get IsDataColumn() {
+        const this$ = this;
+        let matchResult, anythingElse;
+        switch (this$.tag) {
+            case 11: {
+                if (this$.fields[0].tag === 2) {
+                    matchResult = 0;
+                }
+                else {
+                    matchResult = 1;
+                    anythingElse = this$;
+                }
+                break;
+            }
+            case 12: {
+                if (this$.fields[0].tag === 2) {
+                    matchResult = 0;
+                }
+                else {
+                    matchResult = 1;
+                    anythingElse = this$;
+                }
+                break;
+            }
+            default: {
+                matchResult = 1;
+                anythingElse = this$;
+            }
+        }
+        switch (matchResult) {
+            case 0:
+                return true;
+            default:
+                return false;
+        }
+    }
     get IsFeaturedColumn() {
         const this$ = this;
         return this$.tag === 4;
@@ -405,6 +402,7 @@ export class CompositeHeader extends Union {
             case 13:
             case 11:
             case 12:
+            case 14:
             case 8:
             case 5:
             case 6:
@@ -505,6 +503,10 @@ export class CompositeHeader extends Union {
         const this$ = this;
         return this$.tag === 10;
     }
+    get isComment() {
+        const this$ = this;
+        return this$.tag === 14;
+    }
     get isFreeText() {
         const this$ = this;
         return this$.tag === 13;
@@ -590,9 +592,12 @@ export class CompositeHeader extends Union {
             else if (equals(header, "FreeText")) {
                 matchResult = 13;
             }
-            else {
+            else if (equals(header, "Comment")) {
                 matchResult = 14;
             }
+            else {
+                matchResult = 15;
+            }
         }
         else {
             switch (header.tag) {
@@ -648,6 +653,10 @@ export class CompositeHeader extends Union {
                     matchResult = 13;
                     break;
                 }
+                case 14: {
+                    matchResult = 14;
+                    break;
+                }
                 default:
                     matchResult = 0;
             }
@@ -681,6 +690,8 @@ export class CompositeHeader extends Union {
                 return "Only one output column per table. E.g. experimental samples or files.";
             case 13:
                 return "Placeholder";
+            case 14:
+                return "Comment";
             default:
                 throw new Error(`Unable to parse combination to existing CompositeHeader: \`${header}\``);
         }
@@ -727,9 +738,12 @@ export class CompositeHeader extends Union {
     static freeText(s) {
         return new CompositeHeader(13, [s]);
     }
+    static comment(s) {
+        return new CompositeHeader(14, [s]);
+    }
 }
 
 export function CompositeHeader_$reflection() {
-    return union_type("ARCtrl.CompositeHeader", [], CompositeHeader, () => [[["Item", OntologyAnnotation_$reflection()]], [["Item", OntologyAnnotation_$reflection()]], [["Item", OntologyAnnotation_$reflection()]], [["Item", OntologyAnnotation_$reflection()]], [], [], [], [], [], [], [], [["Item", IOType_$reflection()]], [["Item", IOType_$reflection()]], [["Item", string_type]]]);
+    return union_type("ARCtrl.CompositeHeader", [], CompositeHeader, () => [[["Item", OntologyAnnotation_$reflection()]], [["Item", OntologyAnnotation_$reflection()]], [["Item", OntologyAnnotation_$reflection()]], [["Item", OntologyAnnotation_$reflection()]], [], [], [], [], [], [], [], [["Item", IOType_$reflection()]], [["Item", IOType_$reflection()]], [["Item", string_type]], [["Item", string_type]]]);
 }