@nfdi4plants/arctrl 2.0.0-alpha.8 → 2.0.0-beta.2

package/Spreadsheet/AnnotationTable/CompositeHeader.js

@@ -1,13 +1,13 @@
 import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { singleton, ofArray, tryFindIndex, tail, head, isEmpty, map } from "../../fable_modules/fable-library-js.4.16.0/List.js";
 import { OntologyAnnotation } from "../../Core/OntologyAnnotation.js";
-import { freeTextFromFsCells, dataFromFsCells, unitizedFromFsCells, termFromFsCells } from "./CompositeCell.js";
+import { freeTextFromStringCells, dataFromStringCells, unitizedFromStringCells, termFromStringCells } from "./CompositeCell.js";
+import { tryFindIndex, skip, item, equalsWith } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
+import { defaultOf } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
 import { ActivePatterns_$007CComment$007C_$007C, ActivePatterns_$007COutputColumnHeader$007C_$007C, ActivePatterns_$007CInputColumnHeader$007C_$007C, tryParseComponentColumnHeader, tryParseCharacteristicColumnHeader, tryParseFactorColumnHeader, tryParseParameterColumnHeader, ActivePatterns_$007CTSRColumnHeader$007C_$007C, ActivePatterns_$007CTANColumnHeader$007C_$007C, ActivePatterns_$007CUnitColumnHeader$007C_$007C } from "../../Core/Helper/Regex.js";
 import { IOType, CompositeHeader } from "../../Core/Table/CompositeHeader.js";
-import { map as map_1 } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
-import { FsCell } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
+import { map } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
-import { empty, singleton as singleton_1, append, delay, toList } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
+import { empty, singleton, append, delay, toArray } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
 
 export function ActivePattern_mergeIDInfo(idSpace1, localID1, idSpace2, localID2) {
     if (idSpace1 !== idSpace2) {
@@ -22,59 +22,66 @@ export function ActivePattern_mergeIDInfo(idSpace1, localID1, idSpace2, localID2
     };
 }
 
-export function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cells) {
+export function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cellValues) {
     const $007CAC$007C_$007C = categoryParser;
-    const cellValues = map((c) => c.ValueAsString(), cells);
-    let matchResult, name;
-    if (!isEmpty(cellValues)) {
-        const activePatternResult = $007CAC$007C_$007C(head(cellValues));
+    let matchResult, name, name_1, term1, term2;
+    if (!equalsWith((x, y) => (x === y), cellValues, defaultOf()) && (cellValues.length === 1)) {
+        const activePatternResult = $007CAC$007C_$007C(item(0, cellValues));
         if (activePatternResult != null) {
-            if (isEmpty(tail(cellValues))) {
-                matchResult = 0;
-                name = activePatternResult;
+            matchResult = 0;
+            name = activePatternResult;
+        }
+        else {
+            matchResult = 2;
+        }
+    }
+    else if (!equalsWith((x_1, y_1) => (x_1 === y_1), cellValues, defaultOf()) && (cellValues.length === 3)) {
+        const activePatternResult_1 = $007CAC$007C_$007C(item(0, cellValues));
+        if (activePatternResult_1 != null) {
+            const activePatternResult_2 = ActivePatterns_$007CTSRColumnHeader$007C_$007C(item(1, cellValues));
+            if (activePatternResult_2 != null) {
+                const activePatternResult_3 = ActivePatterns_$007CTANColumnHeader$007C_$007C(item(2, cellValues));
+                if (activePatternResult_3 != null) {
+                    matchResult = 1;
+                    name_1 = activePatternResult_1;
+                    term1 = activePatternResult_2;
+                    term2 = activePatternResult_3;
+                }
+                else {
+                    matchResult = 2;
+                }
             }
             else {
-                matchResult = 1;
+                matchResult = 2;
             }
         }
         else {
-            matchResult = 1;
+            matchResult = 2;
         }
     }
     else {
-        matchResult = 1;
+        matchResult = 2;
     }
     switch (matchResult) {
         case 0:
-            return [f(OntologyAnnotation.create(name)), (cells_1) => termFromFsCells(void 0, void 0, cells_1)];
+            return [f(OntologyAnnotation.create(name)), (cellValues_1) => termFromStringCells(void 0, void 0, cellValues_1)];
+        case 1: {
+            const term = ActivePattern_mergeIDInfo(term1.IDSpace, term1.LocalID, term2.IDSpace, term2.LocalID);
+            return [f(OntologyAnnotation.create(name_1, term.TermSourceRef, term.TermAccessionNumber)), (cellValues_2) => termFromStringCells(1, 2, cellValues_2)];
+        }
         default: {
-            let matchResult_1, name_1, term1, term2;
-            if (!isEmpty(cellValues)) {
-                const activePatternResult_1 = $007CAC$007C_$007C(head(cellValues));
-                if (activePatternResult_1 != null) {
-                    if (!isEmpty(tail(cellValues))) {
-                        const activePatternResult_2 = ActivePatterns_$007CTSRColumnHeader$007C_$007C(head(tail(cellValues)));
-                        if (activePatternResult_2 != null) {
-                            if (!isEmpty(tail(tail(cellValues)))) {
-                                const activePatternResult_3 = ActivePatterns_$007CTANColumnHeader$007C_$007C(head(tail(tail(cellValues))));
-                                if (activePatternResult_3 != null) {
-                                    if (isEmpty(tail(tail(tail(cellValues))))) {
-                                        matchResult_1 = 0;
-                                        name_1 = activePatternResult_1;
-                                        term1 = activePatternResult_2;
-                                        term2 = activePatternResult_3;
-                                    }
-                                    else {
-                                        matchResult_1 = 1;
-                                    }
-                                }
-                                else {
-                                    matchResult_1 = 1;
-                                }
-                            }
-                            else {
-                                matchResult_1 = 1;
-                            }
+            let matchResult_1, name_2, term1_1, term2_1;
+            if (!equalsWith((x_2, y_2) => (x_2 === y_2), cellValues, defaultOf()) && (cellValues.length === 3)) {
+                const activePatternResult_4 = $007CAC$007C_$007C(item(0, cellValues));
+                if (activePatternResult_4 != null) {
+                    const activePatternResult_5 = ActivePatterns_$007CTANColumnHeader$007C_$007C(item(1, cellValues));
+                    if (activePatternResult_5 != null) {
+                        const activePatternResult_6 = ActivePatterns_$007CTSRColumnHeader$007C_$007C(item(2, cellValues));
+                        if (activePatternResult_6 != null) {
+                            matchResult_1 = 0;
+                            name_2 = activePatternResult_4;
+                            term1_1 = activePatternResult_6;
+                            term2_1 = activePatternResult_5;
                         }
                         else {
                             matchResult_1 = 1;
@@ -93,33 +100,23 @@ export function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cells) {
             }
             switch (matchResult_1) {
                 case 0: {
-                    const term = ActivePattern_mergeIDInfo(term1.IDSpace, term1.LocalID, term2.IDSpace, term2.LocalID);
-                    return [f(OntologyAnnotation.create(name_1, term.TermSourceRef, term.TermAccessionNumber)), (cells_2) => termFromFsCells(1, 2, cells_2)];
+                    const term_1 = ActivePattern_mergeIDInfo(term1_1.IDSpace, term1_1.LocalID, term2_1.IDSpace, term2_1.LocalID);
+                    return [f(OntologyAnnotation.create(name_2, term_1.TermSourceRef, term_1.TermAccessionNumber)), (cellValues_3) => termFromStringCells(2, 1, cellValues_3)];
                 }
                 default: {
-                    let matchResult_2, name_2, term1_1, term2_1;
-                    if (!isEmpty(cellValues)) {
-                        const activePatternResult_4 = $007CAC$007C_$007C(head(cellValues));
-                        if (activePatternResult_4 != null) {
-                            if (!isEmpty(tail(cellValues))) {
-                                const activePatternResult_5 = ActivePatterns_$007CTANColumnHeader$007C_$007C(head(tail(cellValues)));
-                                if (activePatternResult_5 != null) {
-                                    if (!isEmpty(tail(tail(cellValues)))) {
-                                        const activePatternResult_6 = ActivePatterns_$007CTSRColumnHeader$007C_$007C(head(tail(tail(cellValues))));
-                                        if (activePatternResult_6 != null) {
-                                            if (isEmpty(tail(tail(tail(cellValues))))) {
-                                                matchResult_2 = 0;
-                                                name_2 = activePatternResult_4;
-                                                term1_1 = activePatternResult_6;
-                                                term2_1 = activePatternResult_5;
-                                            }
-                                            else {
-                                                matchResult_2 = 1;
-                                            }
-                                        }
-                                        else {
-                                            matchResult_2 = 1;
-                                        }
+                    let matchResult_2, name_3, term1_2, term2_2;
+                    if (!equalsWith((x_3, y_3) => (x_3 === y_3), cellValues, defaultOf()) && (cellValues.length === 4)) {
+                        const activePatternResult_7 = $007CAC$007C_$007C(item(0, cellValues));
+                        if (activePatternResult_7 != null) {
+                            if (ActivePatterns_$007CUnitColumnHeader$007C_$007C(item(1, cellValues)) != null) {
+                                const activePatternResult_9 = ActivePatterns_$007CTSRColumnHeader$007C_$007C(item(2, cellValues));
+                                if (activePatternResult_9 != null) {
+                                    const activePatternResult_10 = ActivePatterns_$007CTANColumnHeader$007C_$007C(item(3, cellValues));
+                                    if (activePatternResult_10 != null) {
+                                        matchResult_2 = 0;
+                                        name_3 = activePatternResult_7;
+                                        term1_2 = activePatternResult_9;
+                                        term2_2 = activePatternResult_10;
                                     }
                                     else {
                                         matchResult_2 = 1;
@@ -142,43 +139,23 @@ export function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cells) {
                     }
                     switch (matchResult_2) {
                         case 0: {
-                            const term_1 = ActivePattern_mergeIDInfo(term1_1.IDSpace, term1_1.LocalID, term2_1.IDSpace, term2_1.LocalID);
-                            return [f(OntologyAnnotation.create(name_2, term_1.TermSourceRef, term_1.TermAccessionNumber)), (cells_3) => termFromFsCells(2, 1, cells_3)];
+                            const term_2 = ActivePattern_mergeIDInfo(term1_2.IDSpace, term1_2.LocalID, term2_2.IDSpace, term2_2.LocalID);
+                            return [f(OntologyAnnotation.create(name_3, term_2.TermSourceRef, term_2.TermAccessionNumber)), (cellValues_4) => unitizedFromStringCells(1, 2, 3, cellValues_4)];
                         }
                         default: {
-                            let matchResult_3, name_3, term1_2, term2_2;
-                            if (!isEmpty(cellValues)) {
-                                const activePatternResult_7 = $007CAC$007C_$007C(head(cellValues));
-                                if (activePatternResult_7 != null) {
-                                    if (!isEmpty(tail(cellValues))) {
-                                        if (ActivePatterns_$007CUnitColumnHeader$007C_$007C(head(tail(cellValues))) != null) {
-                                            if (!isEmpty(tail(tail(cellValues)))) {
-                                                const activePatternResult_9 = ActivePatterns_$007CTSRColumnHeader$007C_$007C(head(tail(tail(cellValues))));
-                                                if (activePatternResult_9 != null) {
-                                                    if (!isEmpty(tail(tail(tail(cellValues))))) {
-                                                        const activePatternResult_10 = ActivePatterns_$007CTANColumnHeader$007C_$007C(head(tail(tail(tail(cellValues)))));
-                                                        if (activePatternResult_10 != null) {
-                                                            if (isEmpty(tail(tail(tail(tail(cellValues)))))) {
-                                                                matchResult_3 = 0;
-                                                                name_3 = activePatternResult_7;
-                                                                term1_2 = activePatternResult_9;
-                                                                term2_2 = activePatternResult_10;
-                                                            }
-                                                            else {
-                                                                matchResult_3 = 1;
-                                                            }
-                                                        }
-                                                        else {
-                                                            matchResult_3 = 1;
-                                                        }
-                                                    }
-                                                    else {
-                                                        matchResult_3 = 1;
-                                                    }
-                                                }
-                                                else {
-                                                    matchResult_3 = 1;
-                                                }
+                            let matchResult_3, name_4, term1_3, term2_3;
+                            if (!equalsWith((x_4, y_4) => (x_4 === y_4), cellValues, defaultOf()) && (cellValues.length === 4)) {
+                                const activePatternResult_11 = $007CAC$007C_$007C(item(0, cellValues));
+                                if (activePatternResult_11 != null) {
+                                    if (ActivePatterns_$007CUnitColumnHeader$007C_$007C(item(1, cellValues)) != null) {
+                                        const activePatternResult_13 = ActivePatterns_$007CTANColumnHeader$007C_$007C(item(2, cellValues));
+                                        if (activePatternResult_13 != null) {
+                                            const activePatternResult_14 = ActivePatterns_$007CTSRColumnHeader$007C_$007C(item(3, cellValues));
+                                            if (activePatternResult_14 != null) {
+                                                matchResult_3 = 0;
+                                                name_4 = activePatternResult_11;
+                                                term1_3 = activePatternResult_14;
+                                                term2_3 = activePatternResult_13;
                                             }
                                             else {
                                                 matchResult_3 = 1;
@@ -201,72 +178,11 @@ export function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cells) {
                             }
                             switch (matchResult_3) {
                                 case 0: {
-                                    const term_2 = ActivePattern_mergeIDInfo(term1_2.IDSpace, term1_2.LocalID, term2_2.IDSpace, term2_2.LocalID);
-                                    return [f(OntologyAnnotation.create(name_3, term_2.TermSourceRef, term_2.TermAccessionNumber)), (cells_4) => unitizedFromFsCells(1, 2, 3, cells_4)];
-                                }
-                                default: {
-                                    let matchResult_4, name_4, term1_3, term2_3;
-                                    if (!isEmpty(cellValues)) {
-                                        const activePatternResult_11 = $007CAC$007C_$007C(head(cellValues));
-                                        if (activePatternResult_11 != null) {
-                                            if (!isEmpty(tail(cellValues))) {
-                                                if (ActivePatterns_$007CUnitColumnHeader$007C_$007C(head(tail(cellValues))) != null) {
-                                                    if (!isEmpty(tail(tail(cellValues)))) {
-                                                        const activePatternResult_13 = ActivePatterns_$007CTANColumnHeader$007C_$007C(head(tail(tail(cellValues))));
-                                                        if (activePatternResult_13 != null) {
-                                                            if (!isEmpty(tail(tail(tail(cellValues))))) {
-                                                                const activePatternResult_14 = ActivePatterns_$007CTSRColumnHeader$007C_$007C(head(tail(tail(tail(cellValues)))));
-                                                                if (activePatternResult_14 != null) {
-                                                                    if (isEmpty(tail(tail(tail(tail(cellValues)))))) {
-                                                                        matchResult_4 = 0;
-                                                                        name_4 = activePatternResult_11;
-                                                                        term1_3 = activePatternResult_14;
-                                                                        term2_3 = activePatternResult_13;
-                                                                    }
-                                                                    else {
-                                                                        matchResult_4 = 1;
-                                                                    }
-                                                                }
-                                                                else {
-                                                                    matchResult_4 = 1;
-                                                                }
-                                                            }
-                                                            else {
-                                                                matchResult_4 = 1;
-                                                            }
-                                                        }
-                                                        else {
-                                                            matchResult_4 = 1;
-                                                        }
-                                                    }
-                                                    else {
-                                                        matchResult_4 = 1;
-                                                    }
-                                                }
-                                                else {
-                                                    matchResult_4 = 1;
-                                                }
-                                            }
-                                            else {
-                                                matchResult_4 = 1;
-                                            }
-                                        }
-                                        else {
-                                            matchResult_4 = 1;
-                                        }
-                                    }
-                                    else {
-                                        matchResult_4 = 1;
-                                    }
-                                    switch (matchResult_4) {
-                                        case 0: {
-                                            const term_3 = ActivePattern_mergeIDInfo(term1_3.IDSpace, term1_3.LocalID, term2_3.IDSpace, term2_3.LocalID);
-                                            return [f(OntologyAnnotation.create(name_4, term_3.TermSourceRef, term_3.TermAccessionNumber)), (cells_5) => unitizedFromFsCells(1, 3, 2, cells_5)];
-                                        }
-                                        default:
-                                            return void 0;
-                                    }
+                                    const term_3 = ActivePattern_mergeIDInfo(term1_3.IDSpace, term1_3.LocalID, term2_3.IDSpace, term2_3.LocalID);
+                                    return [f(OntologyAnnotation.create(name_4, term_3.TermSourceRef, term_3.TermAccessionNumber)), (cellValues_5) => unitizedFromStringCells(1, 3, 2, cellValues_5)];
                                 }
+                                default:
+                                    return void 0;
                             }
                         }
                     }
@@ -276,8 +192,8 @@ export function ActivePattern_$007CTerm$007C_$007C(categoryParser, f, cells) {
     }
 }
 
-export function ActivePattern_$007CParameter$007C_$007C(cells) {
-    const activePatternResult = ActivePattern_$007CTerm$007C_$007C(tryParseParameterColumnHeader, (Item) => (new CompositeHeader(3, [Item])), cells);
+export function ActivePattern_$007CParameter$007C_$007C(cellValues) {
+    const activePatternResult = ActivePattern_$007CTerm$007C_$007C(tryParseParameterColumnHeader, (Item) => (new CompositeHeader(3, [Item])), cellValues);
     if (activePatternResult != null) {
         const r = activePatternResult;
         return r;
@@ -287,8 +203,8 @@ export function ActivePattern_$007CParameter$007C_$007C(cells) {
     }
 }
 
-export function ActivePattern_$007CFactor$007C_$007C(cells) {
-    const activePatternResult = ActivePattern_$007CTerm$007C_$007C(tryParseFactorColumnHeader, (Item) => (new CompositeHeader(2, [Item])), cells);
+export function ActivePattern_$007CFactor$007C_$007C(cellValues) {
+    const activePatternResult = ActivePattern_$007CTerm$007C_$007C(tryParseFactorColumnHeader, (Item) => (new CompositeHeader(2, [Item])), cellValues);
     if (activePatternResult != null) {
         const r = activePatternResult;
         return r;
@@ -298,8 +214,8 @@ export function ActivePattern_$007CFactor$007C_$007C(cells) {
     }
 }
 
-export function ActivePattern_$007CCharacteristic$007C_$007C(cells) {
-    const activePatternResult = ActivePattern_$007CTerm$007C_$007C(tryParseCharacteristicColumnHeader, (Item) => (new CompositeHeader(1, [Item])), cells);
+export function ActivePattern_$007CCharacteristic$007C_$007C(cellValues) {
+    const activePatternResult = ActivePattern_$007CTerm$007C_$007C(tryParseCharacteristicColumnHeader, (Item) => (new CompositeHeader(1, [Item])), cellValues);
     if (activePatternResult != null) {
         const r = activePatternResult;
         return r;
@@ -309,8 +225,8 @@ export function ActivePattern_$007CCharacteristic$007C_$007C(cells) {
     }
 }
 
-export function ActivePattern_$007CComponent$007C_$007C(cells) {
-    const activePatternResult = ActivePattern_$007CTerm$007C_$007C(tryParseComponentColumnHeader, (Item) => (new CompositeHeader(0, [Item])), cells);
+export function ActivePattern_$007CComponent$007C_$007C(cellValues) {
+    const activePatternResult = ActivePattern_$007CTerm$007C_$007C(tryParseComponentColumnHeader, (Item) => (new CompositeHeader(0, [Item])), cellValues);
     if (activePatternResult != null) {
         const r = activePatternResult;
         return r;
@@ -320,87 +236,65 @@ export function ActivePattern_$007CComponent$007C_$007C(cells) {
     }
 }
 
-export function ActivePattern_$007CInput$007C_$007C(cells) {
-    const cellValues = map((c) => c.ValueAsString(), cells);
-    let matchResult, cols, ioType;
-    if (!isEmpty(cellValues)) {
-        const activePatternResult = ActivePatterns_$007CInputColumnHeader$007C_$007C(head(cellValues));
-        if (activePatternResult != null) {
-            matchResult = 0;
-            cols = tail(cellValues);
-            ioType = activePatternResult;
-        }
-        else {
-            matchResult = 1;
-        }
+export function ActivePattern_$007CInput$007C_$007C(cellValues) {
+    if (cellValues.length === 0) {
+        return void 0;
     }
     else {
-        matchResult = 1;
-    }
-    switch (matchResult) {
-        case 0: {
-            const matchValue = IOType.ofString(ioType);
-            if (matchValue.tag === 2) {
-                const format = map_1((y) => (1 + y), tryFindIndex((s) => (s.indexOf("Data Format") === 0), cols));
-                const selectorFormat = map_1((y_1) => (1 + y_1), tryFindIndex((s_1) => (s_1.indexOf("Data Selector Format") === 0), cols));
-                return [new CompositeHeader(11, [new IOType(2, [])]), (cells_1) => dataFromFsCells(format, selectorFormat, cells_1)];
+        const matchValue = item(0, cellValues);
+        const activePatternResult = ActivePatterns_$007CInputColumnHeader$007C_$007C(matchValue);
+        if (activePatternResult != null) {
+            const ioType = activePatternResult;
+            const cols = skip(1, cellValues);
+            const matchValue_1 = IOType.ofString(ioType);
+            if (matchValue_1.tag === 2) {
+                const format = map((y) => (1 + y), tryFindIndex((s) => (s.indexOf("Data Format") === 0), cols));
+                const selectorFormat = map((y_1) => (1 + y_1), tryFindIndex((s_1) => (s_1.indexOf("Data Selector Format") === 0), cols));
+                return [new CompositeHeader(11, [new IOType(2, [])]), (cellValues_1) => dataFromStringCells(format, selectorFormat, cellValues_1)];
             }
             else {
-                return [new CompositeHeader(11, [matchValue]), freeTextFromFsCells];
+                return [new CompositeHeader(11, [matchValue_1]), freeTextFromStringCells];
             }
         }
-        default:
+        else {
             return void 0;
+        }
     }
 }
 
-export function ActivePattern_$007COutput$007C_$007C(cells) {
-    const cellValues = map((c) => c.ValueAsString(), cells);
-    let matchResult, cols, ioType;
-    if (!isEmpty(cellValues)) {
-        const activePatternResult = ActivePatterns_$007COutputColumnHeader$007C_$007C(head(cellValues));
-        if (activePatternResult != null) {
-            matchResult = 0;
-            cols = tail(cellValues);
-            ioType = activePatternResult;
-        }
-        else {
-            matchResult = 1;
-        }
+export function ActivePattern_$007COutput$007C_$007C(cellValues) {
+    if (cellValues.length === 0) {
+        return void 0;
     }
     else {
-        matchResult = 1;
-    }
-    switch (matchResult) {
-        case 0: {
-            const matchValue = IOType.ofString(ioType);
-            if (matchValue.tag === 2) {
-                const format = map_1((y) => (1 + y), tryFindIndex((s) => (s.indexOf("Data Format") === 0), cols));
-                const selectorFormat = map_1((y_1) => (1 + y_1), tryFindIndex((s_1) => (s_1.indexOf("Data Selector Format") === 0), cols));
-                return [new CompositeHeader(12, [new IOType(2, [])]), (cells_1) => dataFromFsCells(format, selectorFormat, cells_1)];
+        const matchValue = item(0, cellValues);
+        const activePatternResult = ActivePatterns_$007COutputColumnHeader$007C_$007C(matchValue);
+        if (activePatternResult != null) {
+            const ioType = activePatternResult;
+            const cols = skip(1, cellValues);
+            const matchValue_1 = IOType.ofString(ioType);
+            if (matchValue_1.tag === 2) {
+                const format = map((y) => (1 + y), tryFindIndex((s) => (s.indexOf("Data Format") === 0), cols));
+                const selectorFormat = map((y_1) => (1 + y_1), tryFindIndex((s_1) => (s_1.indexOf("Data Selector Format") === 0), cols));
+                return [new CompositeHeader(12, [new IOType(2, [])]), (cellValues_1) => dataFromStringCells(format, selectorFormat, cellValues_1)];
             }
             else {
-                return [new CompositeHeader(12, [matchValue]), freeTextFromFsCells];
+                return [new CompositeHeader(12, [matchValue_1]), freeTextFromStringCells];
             }
         }
-        default:
+        else {
             return void 0;
+        }
     }
 }
 
-export function ActivePattern_$007CComment$007C_$007C(cells) {
-    const cellValues = map((c) => c.ValueAsString(), cells);
+export function ActivePattern_$007CComment$007C_$007C(cellValues) {
     let matchResult, key;
-    if (!isEmpty(cellValues)) {
-        const activePatternResult = ActivePatterns_$007CComment$007C_$007C(head(cellValues));
+    if (!equalsWith((x, y) => (x === y), cellValues, defaultOf()) && (cellValues.length === 1)) {
+        const activePatternResult = ActivePatterns_$007CComment$007C_$007C(item(0, cellValues));
         if (activePatternResult != null) {
-            if (isEmpty(tail(cellValues))) {
-                matchResult = 0;
-                key = activePatternResult;
-            }
-            else {
-                matchResult = 1;
-            }
+            matchResult = 0;
+            key = activePatternResult;
         }
         else {
             matchResult = 1;
@@ -411,13 +305,13 @@ export function ActivePattern_$007CComment$007C_$007C(cells) {
     }
     switch (matchResult) {
         case 0:
-            return [new CompositeHeader(14, [key]), freeTextFromFsCells];
+            return [new CompositeHeader(14, [key]), freeTextFromStringCells];
         default:
             return void 0;
     }
 }
 
-export function ActivePattern_$007CProtocolType$007C_$007C(cells) {
+export function ActivePattern_$007CProtocolType$007C_$007C(cellValues) {
     const activePatternResult = ActivePattern_$007CTerm$007C_$007C((s) => {
         if (s === "Protocol Type") {
             return s;
@@ -425,7 +319,7 @@ export function ActivePattern_$007CProtocolType$007C_$007C(cells) {
         else {
             return void 0;
         }
-    }, (_arg) => (new CompositeHeader(4, [])), cells);
+    }, (_arg) => (new CompositeHeader(4, [])), cellValues);
     if (activePatternResult != null) {
         const r = activePatternResult;
         return r;
@@ -435,67 +329,29 @@ export function ActivePattern_$007CProtocolType$007C_$007C(cells) {
     }
 }
 
-export function ActivePattern_$007CProtocolHeader$007C_$007C(cells) {
-    const cellValues = map((c) => c.ValueAsString(), cells);
+export function ActivePattern_$007CProtocolHeader$007C_$007C(cellValues) {
     let matchResult;
-    if (!isEmpty(cellValues)) {
-        switch (head(cellValues)) {
-            case "Protocol REF": {
-                if (isEmpty(tail(cellValues))) {
-                    matchResult = 0;
-                }
-                else {
-                    matchResult = 6;
-                }
-                break;
-            }
-            case "Protocol Description": {
-                if (isEmpty(tail(cellValues))) {
-                    matchResult = 1;
-                }
-                else {
-                    matchResult = 6;
-                }
-                break;
-            }
-            case "Protocol Uri": {
-                if (isEmpty(tail(cellValues))) {
-                    matchResult = 2;
-                }
-                else {
-                    matchResult = 6;
-                }
-                break;
-            }
-            case "Protocol Version": {
-                if (isEmpty(tail(cellValues))) {
-                    matchResult = 3;
-                }
-                else {
-                    matchResult = 6;
-                }
-                break;
-            }
-            case "Performer": {
-                if (isEmpty(tail(cellValues))) {
-                    matchResult = 4;
-                }
-                else {
-                    matchResult = 6;
-                }
-                break;
-            }
-            case "Date": {
-                if (isEmpty(tail(cellValues))) {
-                    matchResult = 5;
-                }
-                else {
-                    matchResult = 6;
-                }
-                break;
-            }
-            default:
-                matchResult = 6;
+    if (!equalsWith((x, y) => (x === y), cellValues, defaultOf()) && (cellValues.length === 1)) {
+        if (item(0, cellValues) === "Protocol REF") {
+            matchResult = 0;
+        }
+        else if (item(0, cellValues) === "Protocol Description") {
+            matchResult = 1;
+        }
+        else if (item(0, cellValues) === "Protocol Uri") {
+            matchResult = 2;
+        }
+        else if (item(0, cellValues) === "Protocol Version") {
+            matchResult = 3;
+        }
+        else if (item(0, cellValues) === "Performer") {
+            matchResult = 4;
+        }
+        else if (item(0, cellValues) === "Date") {
+            matchResult = 5;
+        }
+        else {
+            matchResult = 6;
         }
     }
     else {
@@ -503,107 +359,93 @@ export function ActivePattern_$007CProtocolHeader$007C_$007C(cells) {
     }
     switch (matchResult) {
         case 0:
-            return [new CompositeHeader(8, []), freeTextFromFsCells];
+            return [new CompositeHeader(8, []), freeTextFromStringCells];
         case 1:
-            return [new CompositeHeader(5, []), freeTextFromFsCells];
+            return [new CompositeHeader(5, []), freeTextFromStringCells];
         case 2:
-            return [new CompositeHeader(6, []), freeTextFromFsCells];
+            return [new CompositeHeader(6, []), freeTextFromStringCells];
         case 3:
-            return [new CompositeHeader(7, []), freeTextFromFsCells];
+            return [new CompositeHeader(7, []), freeTextFromStringCells];
         case 4:
-            return [new CompositeHeader(9, []), freeTextFromFsCells];
+            return [new CompositeHeader(9, []), freeTextFromStringCells];
         case 5:
-            return [new CompositeHeader(10, []), freeTextFromFsCells];
+            return [new CompositeHeader(10, []), freeTextFromStringCells];
         default:
             return void 0;
     }
 }
 
-export function ActivePattern_$007CFreeText$007C_$007C(cells) {
-    const cellValues = map((c) => c.ValueAsString(), cells);
-    let matchResult, text;
-    if (!isEmpty(cellValues)) {
-        if (isEmpty(tail(cellValues))) {
-            matchResult = 0;
-            text = head(cellValues);
-        }
-        else {
-            matchResult = 1;
-        }
+export function ActivePattern_$007CFreeText$007C_$007C(cellValues) {
+    if (!equalsWith((x, y) => (x === y), cellValues, defaultOf()) && (cellValues.length === 1)) {
+        return [new CompositeHeader(13, [item(0, cellValues)]), freeTextFromStringCells];
     }
     else {
-        matchResult = 1;
-    }
-    switch (matchResult) {
-        case 0:
-            return [new CompositeHeader(13, [text]), freeTextFromFsCells];
-        default:
-            return void 0;
+        return void 0;
     }
 }
 
-export function fromFsCells(cells) {
-    const activePatternResult = ActivePattern_$007CParameter$007C_$007C(cells);
+export function fromStringCells(cellValues) {
+    const activePatternResult = ActivePattern_$007CParameter$007C_$007C(cellValues);
     if (activePatternResult != null) {
         const p = activePatternResult;
         return p;
     }
     else {
-        const activePatternResult_1 = ActivePattern_$007CFactor$007C_$007C(cells);
+        const activePatternResult_1 = ActivePattern_$007CFactor$007C_$007C(cellValues);
         if (activePatternResult_1 != null) {
             const f = activePatternResult_1;
             return f;
         }
         else {
-            const activePatternResult_2 = ActivePattern_$007CCharacteristic$007C_$007C(cells);
+            const activePatternResult_2 = ActivePattern_$007CCharacteristic$007C_$007C(cellValues);
             if (activePatternResult_2 != null) {
                 const c = activePatternResult_2;
                 return c;
             }
             else {
-                const activePatternResult_3 = ActivePattern_$007CComponent$007C_$007C(cells);
+                const activePatternResult_3 = ActivePattern_$007CComponent$007C_$007C(cellValues);
                 if (activePatternResult_3 != null) {
                     const c_1 = activePatternResult_3;
                     return c_1;
                 }
                 else {
-                    const activePatternResult_4 = ActivePattern_$007CInput$007C_$007C(cells);
+                    const activePatternResult_4 = ActivePattern_$007CInput$007C_$007C(cellValues);
                     if (activePatternResult_4 != null) {
                         const i = activePatternResult_4;
                         return i;
                     }
                     else {
-                        const activePatternResult_5 = ActivePattern_$007COutput$007C_$007C(cells);
+                        const activePatternResult_5 = ActivePattern_$007COutput$007C_$007C(cellValues);
                         if (activePatternResult_5 != null) {
                             const o = activePatternResult_5;
                             return o;
                         }
                         else {
-                            const activePatternResult_6 = ActivePattern_$007CProtocolType$007C_$007C(cells);
+                            const activePatternResult_6 = ActivePattern_$007CProtocolType$007C_$007C(cellValues);
                             if (activePatternResult_6 != null) {
                                 const pt = activePatternResult_6;
                                 return pt;
                             }
                             else {
-                                const activePatternResult_7 = ActivePattern_$007CProtocolHeader$007C_$007C(cells);
+                                const activePatternResult_7 = ActivePattern_$007CProtocolHeader$007C_$007C(cellValues);
                                 if (activePatternResult_7 != null) {
                                     const ph = activePatternResult_7;
                                     return ph;
                                 }
                                 else {
-                                    const activePatternResult_8 = ActivePattern_$007CComment$007C_$007C(cells);
+                                    const activePatternResult_8 = ActivePattern_$007CComment$007C_$007C(cellValues);
                                     if (activePatternResult_8 != null) {
                                         const c_2 = activePatternResult_8;
                                         return c_2;
                                     }
                                     else {
-                                        const activePatternResult_9 = ActivePattern_$007CFreeText$007C_$007C(cells);
+                                        const activePatternResult_9 = ActivePattern_$007CFreeText$007C_$007C(cellValues);
                                         if (activePatternResult_9 != null) {
                                             const ft = activePatternResult_9;
                                             return ft;
                                         }
                                         else {
-                                            return toFail(printf("Could not parse header group %O"))(cells);
+                                            return toFail(printf("Could not parse header group %O"))(cellValues);
                                         }
                                     }
                                 }
@@ -616,15 +458,15 @@ export function fromFsCells(cells) {
     }
 }
 
-export function toFsCells(hasUnit, header) {
+export function toStringCells(hasUnit, header) {
     if (header.IsDataColumn) {
-        return ofArray([new FsCell(toString(header)), new FsCell("Data Format"), new FsCell("Data Selector Format")]);
+        return [toString(header), "Data Format", "Data Selector Format"];
     }
     else if (header.IsSingleColumn) {
-        return singleton(new FsCell(toString(header)));
+        return [toString(header)];
     }
     else if (header.IsTermColumn) {
-        return toList(delay(() => append(singleton_1(new FsCell(toString(header))), delay(() => append(hasUnit ? singleton_1(new FsCell("Unit")) : empty(), delay(() => append(singleton_1(new FsCell(`Term Source REF (${header.GetColumnAccessionShort})`)), delay(() => singleton_1(new FsCell(`Term Accession Number (${header.GetColumnAccessionShort})`))))))))));
+        return toArray(delay(() => append(singleton(toString(header)), delay(() => append(hasUnit ? singleton("Unit") : empty(), delay(() => append(singleton(`Term Source REF (${header.GetColumnAccessionShort})`), delay(() => singleton(`Term Accession Number (${header.GetColumnAccessionShort})`)))))))));
     }
     else {
         return toFail(printf("header %O is neither single nor term column"))(header);