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

package/Json/Table/CompositeCell.js

@@ -1,6 +1,7 @@
 import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "../OntologyAnnotation.js";
 import { ofArray, singleton } from "../../fable_modules/fable-library-js.4.16.0/List.js";
 import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
+import { Data_compressedDecoder, Data_compressedEncoder, Data_decoder, Data_encoder } from "../Process/Data.js";
 import { list } from "../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
 import { index, string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { CompositeCell } from "../../Core/Table/CompositeCell.js";
@@ -14,31 +15,31 @@ import { unwrap } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 
 export function CompositeCell_encoder(cc) {
     const oaToJsonString = OntologyAnnotation_encoder;
-    const patternInput = (cc.tag === 0) ? ["Term", singleton(oaToJsonString(cc.fields[0]))] : ((cc.tag === 2) ? ["Unitized", ofArray([new Json(0, [cc.fields[0]]), oaToJsonString(cc.fields[1])])] : ["FreeText", singleton(new Json(0, [cc.fields[0]]))]);
+    const patternInput = (cc.tag === 0) ? ["Term", singleton(oaToJsonString(cc.fields[0]))] : ((cc.tag === 2) ? ["Unitized", ofArray([new Json(0, [cc.fields[0]]), oaToJsonString(cc.fields[1])])] : ((cc.tag === 3) ? ["Data", singleton(Data_encoder(cc.fields[0]))] : ["FreeText", singleton(new Json(0, [cc.fields[0]]))]));
     return new Json(5, [[["celltype", new Json(0, [patternInput[0]])], ["values", list(patternInput[1])]]]);
 }
 
 export const CompositeCell_decoder = object((get$) => {
-    let arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4;
+    let arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4, arg_11, objectArg_5;
     let matchValue;
     const objectArg = get$.Required;
     matchValue = objectArg.Field("celltype", string);
-    return (matchValue === "FreeText") ? (new CompositeCell(1, [(arg_3 = index(0, string), (objectArg_1 = get$.Required, objectArg_1.Field("values", arg_3)))])) : ((matchValue === "Term") ? (new CompositeCell(0, [(arg_5 = index(0, OntologyAnnotation_decoder), (objectArg_2 = get$.Required, objectArg_2.Field("values", arg_5)))])) : ((matchValue === "Unitized") ? (new CompositeCell(2, [(arg_7 = index(0, string), (objectArg_3 = get$.Required, objectArg_3.Field("values", arg_7))), (arg_9 = index(1, OntologyAnnotation_decoder), (objectArg_4 = get$.Required, objectArg_4.Field("values", arg_9)))])) : toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue)));
+    return (matchValue === "FreeText") ? (new CompositeCell(1, [(arg_3 = index(0, string), (objectArg_1 = get$.Required, objectArg_1.Field("values", arg_3)))])) : ((matchValue === "Term") ? (new CompositeCell(0, [(arg_5 = index(0, OntologyAnnotation_decoder), (objectArg_2 = get$.Required, objectArg_2.Field("values", arg_5)))])) : ((matchValue === "Unitized") ? (new CompositeCell(2, [(arg_7 = index(0, string), (objectArg_3 = get$.Required, objectArg_3.Field("values", arg_7))), (arg_9 = index(1, OntologyAnnotation_decoder), (objectArg_4 = get$.Required, objectArg_4.Field("values", arg_9)))])) : ((matchValue === "Data") ? (new CompositeCell(3, [(arg_11 = index(0, Data_decoder), (objectArg_5 = get$.Required, objectArg_5.Field("values", arg_11)))])) : toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue))));
 });
 
 export function CompositeCell_encoderCompressed(stringTable, oaTable, cc) {
-    const patternInput = (cc.tag === 0) ? ["Term", singleton(encodeOA(oaTable, cc.fields[0]))] : ((cc.tag === 2) ? ["Unitized", ofArray([encodeString(stringTable, cc.fields[0]), encodeOA(oaTable, cc.fields[1])])] : ["FreeText", singleton(encodeString(stringTable, cc.fields[0]))]);
+    const patternInput = (cc.tag === 0) ? ["Term", singleton(encodeOA(oaTable, cc.fields[0]))] : ((cc.tag === 2) ? ["Unitized", ofArray([encodeString(stringTable, cc.fields[0]), encodeOA(oaTable, cc.fields[1])])] : ((cc.tag === 3) ? ["Data", singleton(Data_compressedEncoder(stringTable, cc.fields[0]))] : ["FreeText", singleton(encodeString(stringTable, cc.fields[0]))]));
     return new Json(5, [[["t", encodeString(stringTable, patternInput[0])], ["v", list(patternInput[1])]]]);
 }
 
 export function CompositeCell_decoderCompressed(stringTable, oaTable) {
     return object((get$) => {
-        let arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4;
+        let arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4, arg_11, objectArg_5;
         let matchValue;
         const arg_1 = decodeString(stringTable);
         const objectArg = get$.Required;
         matchValue = objectArg.Field("t", arg_1);
-        return (matchValue === "FreeText") ? (new CompositeCell(1, [(arg_3 = index(0, decodeString(stringTable)), (objectArg_1 = get$.Required, objectArg_1.Field("v", arg_3)))])) : ((matchValue === "Term") ? (new CompositeCell(0, [(arg_5 = index(0, decodeOA(oaTable)), (objectArg_2 = get$.Required, objectArg_2.Field("v", arg_5)))])) : ((matchValue === "Unitized") ? (new CompositeCell(2, [(arg_7 = index(0, decodeString(stringTable)), (objectArg_3 = get$.Required, objectArg_3.Field("v", arg_7))), (arg_9 = index(1, decodeOA(oaTable)), (objectArg_4 = get$.Required, objectArg_4.Field("v", arg_9)))])) : toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue)));
+        return (matchValue === "FreeText") ? (new CompositeCell(1, [(arg_3 = index(0, decodeString(stringTable)), (objectArg_1 = get$.Required, objectArg_1.Field("v", arg_3)))])) : ((matchValue === "Term") ? (new CompositeCell(0, [(arg_5 = index(0, decodeOA(oaTable)), (objectArg_2 = get$.Required, objectArg_2.Field("v", arg_5)))])) : ((matchValue === "Unitized") ? (new CompositeCell(2, [(arg_7 = index(0, decodeString(stringTable)), (objectArg_3 = get$.Required, objectArg_3.Field("v", arg_7))), (arg_9 = index(1, decodeOA(oaTable)), (objectArg_4 = get$.Required, objectArg_4.Field("v", arg_9)))])) : ((matchValue === "Data") ? (new CompositeCell(3, [(arg_11 = index(0, Data_compressedDecoder(stringTable)), (objectArg_5 = get$.Required, objectArg_5.Field("v", arg_11)))])) : toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue))));
     });
 }
 

package/Json/Table/CompositeHeader.js

@@ -1,7 +1,7 @@
 import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "../OntologyAnnotation.js";
+import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
 import { empty, singleton } from "../../fable_modules/fable-library-js.4.16.0/List.js";
 import { IOType_decoder, IOType_encoder } from "./IOType.js";
-import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
 import { list } from "../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
 import { index, string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { CompositeHeader } from "../../Core/Table/CompositeHeader.js";
@@ -13,11 +13,12 @@ import { unwrap } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 
 export function CompositeHeader_encoder(ch) {
     const oaToJsonString = OntologyAnnotation_encoder;
-    const patternInput = (ch.tag === 3) ? ["Parameter", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 2) ? ["Factor", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 1) ? ["Characteristic", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 0) ? ["Component", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 4) ? ["ProtocolType", empty()] : ((ch.tag === 8) ? ["ProtocolREF", empty()] : ((ch.tag === 5) ? ["ProtocolDescription", empty()] : ((ch.tag === 6) ? ["ProtocolUri", empty()] : ((ch.tag === 7) ? ["ProtocolVersion", empty()] : ((ch.tag === 9) ? ["Performer", empty()] : ((ch.tag === 10) ? ["Date", empty()] : ((ch.tag === 11) ? ["Input", singleton(IOType_encoder(ch.fields[0]))] : ((ch.tag === 12) ? ["Output", singleton(IOType_encoder(ch.fields[0]))] : [ch.fields[0], empty()]))))))))))));
+    const patternInput = (ch.tag === 14) ? ["Comment", singleton(new Json(0, [ch.fields[0]]))] : ((ch.tag === 3) ? ["Parameter", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 2) ? ["Factor", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 1) ? ["Characteristic", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 0) ? ["Component", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 4) ? ["ProtocolType", empty()] : ((ch.tag === 8) ? ["ProtocolREF", empty()] : ((ch.tag === 5) ? ["ProtocolDescription", empty()] : ((ch.tag === 6) ? ["ProtocolUri", empty()] : ((ch.tag === 7) ? ["ProtocolVersion", empty()] : ((ch.tag === 9) ? ["Performer", empty()] : ((ch.tag === 10) ? ["Date", empty()] : ((ch.tag === 11) ? ["Input", singleton(IOType_encoder(ch.fields[0]))] : ((ch.tag === 12) ? ["Output", singleton(IOType_encoder(ch.fields[0]))] : [ch.fields[0], empty()])))))))))))));
     return new Json(5, [[["headertype", new Json(0, [patternInput[0]])], ["values", list(patternInput[1])]]]);
 }
 
 export const CompositeHeader_decoder = object((get$) => {
+    let arg_7, objectArg_3;
     let headerType;
     const objectArg = get$.Required;
     headerType = objectArg.Field("headertype", string);
@@ -31,7 +32,7 @@ export const CompositeHeader_decoder = object((get$) => {
         const objectArg_2 = get$.Required;
         return objectArg_2.Field("values", arg_5);
     };
-    return (headerType === "Characteristic") ? (new CompositeHeader(1, [oa()])) : ((headerType === "Parameter") ? (new CompositeHeader(3, [oa()])) : ((headerType === "Component") ? (new CompositeHeader(0, [oa()])) : ((headerType === "Factor") ? (new CompositeHeader(2, [oa()])) : ((headerType === "Input") ? (new CompositeHeader(11, [io()])) : ((headerType === "Output") ? (new CompositeHeader(12, [io()])) : ((headerType === "ProtocolType") ? (new CompositeHeader(4, [])) : ((headerType === "ProtocolREF") ? (new CompositeHeader(8, [])) : ((headerType === "ProtocolDescription") ? (new CompositeHeader(5, [])) : ((headerType === "ProtocolUri") ? (new CompositeHeader(6, [])) : ((headerType === "ProtocolVersion") ? (new CompositeHeader(7, [])) : ((headerType === "Performer") ? (new CompositeHeader(9, [])) : ((headerType === "Date") ? (new CompositeHeader(10, [])) : (new CompositeHeader(13, [headerType]))))))))))))));
+    return (headerType === "Characteristic") ? (new CompositeHeader(1, [oa()])) : ((headerType === "Parameter") ? (new CompositeHeader(3, [oa()])) : ((headerType === "Component") ? (new CompositeHeader(0, [oa()])) : ((headerType === "Factor") ? (new CompositeHeader(2, [oa()])) : ((headerType === "Input") ? (new CompositeHeader(11, [io()])) : ((headerType === "Output") ? (new CompositeHeader(12, [io()])) : ((headerType === "ProtocolType") ? (new CompositeHeader(4, [])) : ((headerType === "ProtocolREF") ? (new CompositeHeader(8, [])) : ((headerType === "ProtocolDescription") ? (new CompositeHeader(5, [])) : ((headerType === "ProtocolUri") ? (new CompositeHeader(6, [])) : ((headerType === "ProtocolVersion") ? (new CompositeHeader(7, [])) : ((headerType === "Performer") ? (new CompositeHeader(9, [])) : ((headerType === "Date") ? (new CompositeHeader(10, [])) : ((headerType === "Comment") ? (new CompositeHeader(14, [(arg_7 = index(0, string), (objectArg_3 = get$.Required, objectArg_3.Field("values", arg_7)))])) : (new CompositeHeader(13, [headerType])))))))))))))));
 });
 
 export function ARCtrl_CompositeHeader__CompositeHeader_fromJsonString_Static_Z721C83C5(s) {

package/Spreadsheet/AnnotationTable/ArcTable.js

@@ -1,16 +1,15 @@
-import { iterateIndexed, length, ofArray, sortBy, collect, toArray, empty, tail, head, isEmpty, cons, singleton, fold, map, reverse } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { tryParseReferenceColumnHeader } from "../../Core/Helper/Regex.js";
+import { iterateIndexed, length, sortBy, collect, toArray, exists, ofArray, empty, tail, head, isEmpty, cons, singleton, fold, map, reverse } from "../../fable_modules/fable-library-js.4.16.0/List.js";
 import { map as map_1, toList, tryFind } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { toFsColumns, fixDeprecatedIOHeader, fromFsColumns } from "./CompositeColumn.js";
 import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { ArcTable } from "../../Core/Table/ArcTable.js";
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.1.3/FsWorksheet.fs.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
 import { comparePrimitives } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
-import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.5.1.3/Ranges/FsRangeAddress.fs.js";
-import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.5.1.3/FsAddress.fs.js";
-import { Dictionary_tryGet } from "../../fable_modules/FsSpreadsheet.5.1.3/Cells/FsCellsCollection.fs.js";
+import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
+import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
+import { Dictionary_tryGet } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCellsCollection.fs.js";
 import { addToDict } from "../../fable_modules/fable-library-js.4.16.0/MapUtil.js";
-import { FsRangeBase__Cell_Z3407A44B } from "../../fable_modules/FsSpreadsheet.5.1.3/Ranges/FsRangeBase.fs.js";
+import { FsRangeBase__Cell_Z3407A44B } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeBase.fs.js";
 
 /**
  * Iterates over elements of the input list and groups adjacent elements.
@@ -49,6 +48,7 @@ export function classifyHeaderOrder(header) {
         case 1:
         case 2:
         case 3:
+        case 14:
         case 13:
             return 3;
         case 12:
@@ -62,15 +62,12 @@ export function classifyColumnOrder(column) {
     return classifyHeaderOrder(column.Header);
 }
 
+export const helperColumnStrings = ofArray(["Term Source REF", "Term Accession Number", "Unit", "Data Format", "Data Selector Format"]);
+
 export function groupColumnsByHeader(columns) {
     return Aux_List_groupWhen((c) => {
         const v = c.Item(1).ValueAsString();
-        if (tryParseReferenceColumnHeader(v) == null) {
-            return !(v.indexOf("Unit") === 0);
-        }
-        else {
-            return false;
-        }
+        return !exists((s) => (v.indexOf(s) === 0), helperColumnStrings);
     }, columns);
 }
 

package/Spreadsheet/AnnotationTable/CompositeCell.js

@@ -1,56 +1,33 @@
-import { singleton, ofArray, head, tail, isEmpty, map } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { singleton, ofArray, item, map } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { defaultArg, unwrap, map as map_1 } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { CompositeCell } from "../../Core/Table/CompositeCell.js";
-import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { FsCell } from "../../fable_modules/FsSpreadsheet.5.1.3/Cells/FsCell.fs.js";
-import { defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { FsCell } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
 
-export function fromFsCells(cells) {
+export function termFromFsCells(tsrCol, tanCol, cells) {
     const cellValues = map((c) => c.ValueAsString(), cells);
-    let matchResult, v, v1, v2, v3, v1_1, v2_1, v3_1, v4;
-    if (!isEmpty(cellValues)) {
-        if (!isEmpty(tail(cellValues))) {
-            if (!isEmpty(tail(tail(cellValues)))) {
-                if (!isEmpty(tail(tail(tail(cellValues))))) {
-                    if (isEmpty(tail(tail(tail(tail(cellValues)))))) {
-                        matchResult = 2;
-                        v1_1 = head(cellValues);
-                        v2_1 = head(tail(cellValues));
-                        v3_1 = head(tail(tail(cellValues)));
-                        v4 = head(tail(tail(tail(cellValues))));
-                    }
-                    else {
-                        matchResult = 3;
-                    }
-                }
-                else {
-                    matchResult = 1;
-                    v1 = head(cellValues);
-                    v2 = head(tail(cellValues));
-                    v3 = head(tail(tail(cellValues)));
-                }
-            }
-            else {
-                matchResult = 3;
-            }
-        }
-        else {
-            matchResult = 0;
-            v = head(cellValues);
-        }
-    }
-    else {
-        matchResult = 3;
-    }
-    switch (matchResult) {
-        case 0:
-            return CompositeCell.createFreeText(v);
-        case 1:
-            return CompositeCell.createTermFromString(v1, v2, v3);
-        case 2:
-            return CompositeCell.createUnitizedFromString(v1_1, v2_1, v3_1, v4);
-        default:
-            return toFail(printf("Dafuq"));
-    }
+    const tan = map_1((i) => item(i, cellValues), tanCol);
+    const tsr = map_1((i_1) => item(i_1, cellValues), tsrCol);
+    return CompositeCell.createTermFromString(item(0, cellValues), unwrap(tsr), unwrap(tan));
+}
+
+export function unitizedFromFsCells(unitCol, tsrCol, tanCol, cells) {
+    const cellValues = map((c) => c.ValueAsString(), cells);
+    const unit = item(unitCol, cellValues);
+    const tan = map_1((i) => item(i, cellValues), tanCol);
+    const tsr = map_1((i_1) => item(i_1, cellValues), tsrCol);
+    return CompositeCell.createUnitizedFromString(item(0, cellValues), unit, unwrap(tsr), unwrap(tan));
+}
+
+export function freeTextFromFsCells(cells) {
+    const cellValues = map((c) => c.ValueAsString(), cells);
+    return CompositeCell.createFreeText(item(0, cellValues));
+}
+
+export function dataFromFsCells(format, selectorFormat, cells) {
+    const cellValues = map((c) => c.ValueAsString(), cells);
+    const format_1 = map_1((i) => item(i, cellValues), format);
+    const selectorFormat_1 = map_1((i_1) => item(i_1, cellValues), selectorFormat);
+    return CompositeCell.createDataFromString(item(0, cellValues), unwrap(format_1), unwrap(selectorFormat_1));
 }
 
 export function toFsCells(isTerm, hasUnit, cell) {
@@ -64,6 +41,11 @@ export function toFsCells(isTerm, hasUnit, cell) {
             }
         case 2:
             return ofArray([new FsCell(cell.fields[0]), new FsCell(cell.fields[1].NameText), new FsCell(defaultArg(cell.fields[1].TermSourceREF, "")), new FsCell(cell.fields[1].TermAccessionOntobeeUrl)]);
+        case 3: {
+            const format = new FsCell(defaultArg(cell.fields[0].Format, ""));
+            const selectorFormat = new FsCell(defaultArg(cell.fields[0].SelectorFormat, ""));
+            return ofArray([new FsCell(defaultArg(cell.fields[0].Name, "")), format, selectorFormat]);
+        }
         default:
             if (hasUnit) {
                 return ofArray([new FsCell(cell.fields[0]), new FsCell(""), new FsCell(""), new FsCell("")]);

package/Spreadsheet/AnnotationTable/CompositeColumn.js

@@ -2,14 +2,14 @@ import { CompositeHeader, IOType } from "../../Core/Table/CompositeHeader.js";
 import { toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
 import { toFsCells, fromFsCells } from "./CompositeHeader.js";
 import { singleton as singleton_1, ofArray, item, map } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { FsAddress__get_RowNumber } from "../../fable_modules/FsSpreadsheet.5.1.3/FsAddress.fs.js";
-import { FsRangeAddress__get_LastAddress } from "../../fable_modules/FsSpreadsheet.5.1.3/Ranges/FsRangeAddress.fs.js";
-import { FsRangeBase__get_RangeAddress } from "../../fable_modules/FsSpreadsheet.5.1.3/Ranges/FsRangeBase.fs.js";
-import { singleton, append, toList, exists, map as map_1, delay, toArray } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
-import { toFsCells as toFsCells_1, fromFsCells as fromFsCells_1 } from "./CompositeCell.js";
+import { FsAddress__get_RowNumber } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
+import { FsRangeAddress__get_LastAddress } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
+import { FsRangeBase__get_RangeAddress } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeBase.fs.js";
+import { empty, singleton, append, toList, exists, map as map_1, delay, toArray } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { rangeDouble } from "../../fable_modules/fable-library-js.4.16.0/Range.js";
 import { CompositeColumn } from "../../Core/Table/CompositeColumn.js";
 import { item as item_1, map as map_2 } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
+import { toFsCells as toFsCells_1 } from "./CompositeCell.js";
 
 /**
  * Checks if the column header is a deprecated IO Header. If so, fixes it.
@@ -21,7 +21,7 @@ import { item as item_1, map as map_2 } from "../../fable_modules/fable-library-
 export function fixDeprecatedIOHeader(col) {
     const matchValue = IOType.ofString(col.Item(1).ValueAsString());
     switch (matchValue.tag) {
-        case 6:
+        case 4:
             return col;
         case 0: {
             col.Item(1).SetValueAs(toString(new CompositeHeader(11, [new IOType(0, [])])));
@@ -35,15 +35,16 @@ export function fixDeprecatedIOHeader(col) {
 }
 
 export function fromFsColumns(columns) {
-    const header = fromFsCells(map((c) => c.Item(1), columns));
+    const patternInput = fromFsCells(map((c) => c.Item(1), columns));
     const l = FsAddress__get_RowNumber(FsRangeAddress__get_LastAddress(FsRangeBase__get_RangeAddress(item(0, columns)))) | 0;
-    const cells_2 = toArray(delay(() => map_1((i) => fromFsCells_1(map((c_1) => c_1.Item(i), columns)), rangeDouble(2, 1, l))));
-    return CompositeColumn.create(header, cells_2);
+    const cells_1 = toArray(delay(() => map_1((i) => patternInput[1](map((c_1) => c_1.Item(i), columns)), rangeDouble(2, 1, l))));
+    return CompositeColumn.create(patternInput[0], cells_1);
 }
 
 export function toFsColumns(column) {
     const hasUnit = exists((c) => c.isUnitized, column.Cells);
     const isTerm = column.Header.IsTermColumn;
+    const isData = column.Header.IsDataColumn;
     const header = toFsCells(hasUnit, column.Header);
     const cells = map_2((cell) => toFsCells_1(isTerm, hasUnit, cell), column.Cells);
     if (hasUnit) {
@@ -52,8 +53,13 @@ export function toFsColumns(column) {
     else if (isTerm) {
         return ofArray([toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_4) => item(0, item_1(i_4, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_5) => item(1, item_1(i_5, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))), toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_6) => item(2, item_1(i_6, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))]);
     }
+    else if (isData) {
+        const hasFormat = exists((c_1) => (c_1.AsData.Format != null), column.Cells);
+        const hasSelectorFormat = exists((c_2) => (c_2.AsData.SelectorFormat != null), column.Cells);
+        return toList(delay(() => append(singleton(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_7) => item(0, item_1(i_7, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))), delay(() => append(hasFormat ? singleton(toList(delay(() => append(singleton(item(1, header)), delay(() => map_1((i_8) => item(1, item_1(i_8, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty(), delay(() => (hasSelectorFormat ? singleton(toList(delay(() => append(singleton(item(2, header)), delay(() => map_1((i_9) => item(2, item_1(i_9, cells)), rangeDouble(0, 1, column.Cells.length - 1))))))) : empty())))))));
+    }
     else {
-        return singleton_1(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_7) => item(0, item_1(i_7, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))));
+        return singleton_1(toList(delay(() => append(singleton(item(0, header)), delay(() => map_1((i_10) => item(0, item_1(i_10, cells)), rangeDouble(0, 1, column.Cells.length - 1)))))));
     }
 }