@nfdi4plants/arctrl 2.0.0-alpha.2 → 2.0.0-alpha.4

package/Json/Process/Data.js

@@ -1,19 +1,57 @@
-import { printf, toText, replace } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { URIModule_toString } from "../../Core/URI.js";
-import { ofArray, singleton, choose } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { singleton, ofArray, choose } from "../../fable_modules/fable-library-js.4.16.0/List.js";
 import { equals } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
 import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
+import { defaultSpaces, tryIncludeSeq, tryInclude } from "../Encode.js";
+import { DataFile_ROCrate_decoder, DataFile_ROCrate_encoder, DataFile_ISAJson_decoder, DataFile_ISAJson_encoder } from "./DataFile.js";
+import { Comment_ISAJson_decoder, Comment_ISAJson_encoder, Comment_ROCrate_decoder, Comment_ROCrate_encoder, Comment_decoder, Comment_encoder } from "../Comment.js";
+import { string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { Data } from "../../Core/Data.js";
+import { unwrap } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { Decode_objectNoAdditionalProperties, Decode_resizeArray, Decode_uri } from "../Decode.js";
+import { decodeString, encodeString } from "../StringTable.js";
+import { printf, toText, replace } from "../../fable_modules/fable-library-js.4.16.0/String.js";
+import { URIModule_toString } from "../../Core/URI.js";
 import { list as list_1 } from "../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
-import { defaultSpaces, tryIncludeListOpt, tryInclude } from "../Encode.js";
-import { DataFile_ISAJson_decoder, DataFile_ISAJson_encoder, DataFile_ROCrate_decoder, DataFile_ROCrate_encoder } from "./DataFile.js";
-import { Comment_ISAJson_decoder, Comment_ISAJson_encoder, Comment_ROCrate_decoder, Comment_ROCrate_encoder } from "../Comment.js";
 import { context_jsonvalue } from "../context/rocrate/isa_data_context.js";
-import { list as list_2, string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
-import { Decode_objectNoAdditionalProperties, Decode_uri } from "../Decode.js";
-import { Data } from "../../Core/Process/Data.js";
 import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
 import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
 
+export function Data_encoder(d) {
+    return new Json(5, [choose((tupledArg) => {
+        const v = tupledArg[1];
+        if (equals(v, new Json(3, []))) {
+            return void 0;
+        }
+        else {
+            return [tupledArg[0], v];
+        }
+    }, ofArray([tryInclude("@id", (value) => (new Json(0, [value])), d.ID), tryInclude("name", (value_2) => (new Json(0, [value_2])), d.Name), tryInclude("dataType", DataFile_ISAJson_encoder, d.DataType), tryInclude("format", (value_4) => (new Json(0, [value_4])), d.Format), tryInclude("selectorFormat", (value_6) => (new Json(0, [value_6])), d.SelectorFormat), tryIncludeSeq("comments", Comment_encoder, d.Comments)]))]);
+}
+
+export const Data_decoder = object((get$) => {
+    let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5;
+    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("dataType", DataFile_ISAJson_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("format", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("selectorFormat", Decode_uri))), unwrap((arg_11 = Decode_resizeArray(Comment_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("comments", arg_11)))));
+});
+
+export function Data_compressedEncoder(stringTable, d) {
+    return new Json(5, [choose((tupledArg) => {
+        const v = tupledArg[1];
+        if (equals(v, new Json(3, []))) {
+            return void 0;
+        }
+        else {
+            return [tupledArg[0], v];
+        }
+    }, ofArray([tryInclude("i", (s) => encodeString(stringTable, s), d.ID), tryInclude("n", (s_1) => encodeString(stringTable, s_1), d.Name), tryInclude("d", DataFile_ISAJson_encoder, d.DataType), tryInclude("f", (s_2) => encodeString(stringTable, s_2), d.Format), tryInclude("s", (s_3) => encodeString(stringTable, s_3), d.SelectorFormat), tryIncludeSeq("c", Comment_encoder, d.Comments)]))]);
+}
+
+export function Data_compressedDecoder(stringTable) {
+    return object((get$) => {
+        let arg_1, objectArg, arg_3, objectArg_1, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4, arg_11, objectArg_5;
+        return new Data(unwrap((arg_1 = decodeString(stringTable), (objectArg = get$.Optional, objectArg.Field("i", arg_1)))), unwrap((arg_3 = decodeString(stringTable), (objectArg_1 = get$.Optional, objectArg_1.Field("n", arg_3)))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("d", DataFile_ISAJson_decoder))), unwrap((arg_7 = decodeString(stringTable), (objectArg_3 = get$.Optional, objectArg_3.Field("f", arg_7)))), unwrap((arg_9 = decodeString(stringTable), (objectArg_4 = get$.Optional, objectArg_4.Field("s", arg_9)))), unwrap((arg_11 = Decode_resizeArray(Comment_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("c", arg_11)))));
+    });
+}
+
 export function Data_ROCrate_genID(d) {
     const matchValue = d.ID;
     if (matchValue == null) {
@@ -39,12 +77,12 @@ export function Data_ROCrate_encoder(oa) {
         else {
             return [tupledArg[0], v];
         }
-    }, ofArray([["@id", new Json(0, [Data_ROCrate_genID(oa)])], ["@type", list_1(singleton(new Json(0, ["Data"])))], tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", DataFile_ROCrate_encoder, oa.DataType), tryIncludeListOpt("comments", Comment_ROCrate_encoder, oa.Comments), ["@context", context_jsonvalue]]))]);
+    }, ofArray([["@id", new Json(0, [Data_ROCrate_genID(oa)])], ["@type", list_1(singleton(new Json(0, ["Data"])))], tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", DataFile_ROCrate_encoder, oa.DataType), tryInclude("encodingFormat", (value_5) => (new Json(0, [value_5])), oa.Format), tryInclude("usageInfo", (value_7) => (new Json(0, [value_7])), oa.SelectorFormat), tryIncludeSeq("comments", Comment_ROCrate_encoder, oa.Comments), ["@context", context_jsonvalue]]))]);
 }
 
 export const Data_ROCrate_decoder = object((get$) => {
-    let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3;
-    return new Data((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (objectArg_2 = get$.Optional, objectArg_2.Field("type", DataFile_ROCrate_decoder)), (arg_7 = list_2(Comment_ROCrate_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7))));
+    let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5;
+    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("type", DataFile_ROCrate_decoder))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("encodingFormat", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("usageInfo", Decode_uri))), unwrap((arg_11 = Decode_resizeArray(Comment_ROCrate_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("comments", arg_11)))));
 });
 
 export function Data_ISAJson_encoder(oa) {
@@ -56,17 +94,17 @@ export function Data_ISAJson_encoder(oa) {
         else {
             return [tupledArg[0], v];
         }
-    }, ofArray([tryInclude("@id", (value) => (new Json(0, [value])), oa.ID), tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", DataFile_ISAJson_encoder, oa.DataType), tryIncludeListOpt("comments", Comment_ISAJson_encoder, oa.Comments)]))]);
+    }, ofArray([tryInclude("@id", (value) => (new Json(0, [value])), oa.ID), tryInclude("name", (value_2) => (new Json(0, [value_2])), oa.Name), tryInclude("type", DataFile_ISAJson_encoder, oa.DataType), tryIncludeSeq("comments", Comment_ISAJson_encoder, oa.Comments)]))]);
 }
 
 export const Data_ISAJson_allowedFields = ofArray(["@id", "name", "type", "comments", "@type", "@context"]);
 
 export const Data_ISAJson_decoder = Decode_objectNoAdditionalProperties(Data_ISAJson_allowedFields, (get$) => {
     let objectArg, objectArg_1, objectArg_2, arg_7, objectArg_3;
-    return new Data((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri)), (objectArg_1 = get$.Optional, objectArg_1.Field("name", string)), (objectArg_2 = get$.Optional, objectArg_2.Field("type", DataFile_ISAJson_decoder)), (arg_7 = list_2(Comment_ISAJson_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7))));
+    return new Data(unwrap((objectArg = get$.Optional, objectArg.Field("@id", Decode_uri))), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("name", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("type", DataFile_ISAJson_decoder))), void 0, void 0, unwrap((arg_7 = Decode_resizeArray(Comment_ISAJson_decoder), (objectArg_3 = get$.Optional, objectArg_3.Field("comments", arg_7)))));
 });
 
-export function ARCtrl_Process_Data__Data_fromISAJsonString_Static_Z721C83C5(s) {
+export function ARCtrl_Data__Data_fromISAJsonString_Static_Z721C83C5(s) {
     const matchValue = fromString(Data_ISAJson_decoder, s);
     if (matchValue.tag === 1) {
         throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
@@ -76,14 +114,14 @@ export function ARCtrl_Process_Data__Data_fromISAJsonString_Static_Z721C83C5(s)
     }
 }
 
-export function ARCtrl_Process_Data__Data_toISAJsonString_Static_71136F3F(spaces) {
+export function ARCtrl_Data__Data_toISAJsonString_Static_71136F3F(spaces) {
     return (f) => {
         const value = Data_ISAJson_encoder(f);
         return toString(defaultSpaces(spaces), value);
     };
 }
 
-export function ARCtrl_Process_Data__Data_fromROCrateJsonString_Static_Z721C83C5(s) {
+export function ARCtrl_Data__Data_fromROCrateJsonString_Static_Z721C83C5(s) {
     const matchValue = fromString(Data_ROCrate_decoder, s);
     if (matchValue.tag === 1) {
         throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
@@ -93,7 +131,7 @@ export function ARCtrl_Process_Data__Data_fromROCrateJsonString_Static_Z721C83C5
     }
 }
 
-export function ARCtrl_Process_Data__Data_toROCrateJsonString_Static_71136F3F(spaces) {
+export function ARCtrl_Data__Data_toROCrateJsonString_Static_71136F3F(spaces) {
     return (f) => {
         const value = Data_ROCrate_encoder(f);
         return toString(defaultSpaces(spaces), value);

package/Json/Process/DataFile.js

@@ -1,7 +1,7 @@
 import { ErrorReason$1, Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
 import { string } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { FSharpResult$2 } from "../../fable_modules/fable-library-js.4.16.0/Result.js";
-import { DataFile } from "../../Core/Process/DataFile.js";
+import { DataFile } from "../../Core/DataFile.js";
 import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
 import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
@@ -45,7 +45,7 @@ export const DataFile_ISAJson_encoder = DataFile_ROCrate_encoder;
 
 export const DataFile_ISAJson_decoder = DataFile_ROCrate_decoder;
 
-export function ARCtrl_Process_DataFile__DataFile_fromISAJsonString_Static_Z721C83C5(s) {
+export function ARCtrl_DataFile__DataFile_fromISAJsonString_Static_Z721C83C5(s) {
     const matchValue = fromString(DataFile_ISAJson_decoder, s);
     if (matchValue.tag === 1) {
         throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
@@ -55,14 +55,14 @@ export function ARCtrl_Process_DataFile__DataFile_fromISAJsonString_Static_Z721C
     }
 }
 
-export function ARCtrl_Process_DataFile__DataFile_toISAJsonString_Static_71136F3F(spaces) {
+export function ARCtrl_DataFile__DataFile_toISAJsonString_Static_71136F3F(spaces) {
     return (f) => {
         const value = DataFile_ISAJson_encoder(f);
         return toString(defaultSpaces(spaces), value);
     };
 }
 
-export function ARCtrl_Process_DataFile__DataFile_fromROCrateJsonString_Static_Z721C83C5(s) {
+export function ARCtrl_DataFile__DataFile_fromROCrateJsonString_Static_Z721C83C5(s) {
     const matchValue = fromString(DataFile_ROCrate_decoder, s);
     if (matchValue.tag === 1) {
         throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
@@ -72,7 +72,7 @@ export function ARCtrl_Process_DataFile__DataFile_fromROCrateJsonString_Static_Z
     }
 }
 
-export function ARCtrl_Process_DataFile__DataFile_toROCrateJsonString_Static_71136F3F(spaces) {
+export function ARCtrl_DataFile__DataFile_toROCrateJsonString_Static_71136F3F(spaces) {
     return (f) => {
         const value = DataFile_ROCrate_encoder(f);
         return toString(defaultSpaces(spaces), value);

package/Json/Process/PropertyValue.js

@@ -1,20 +1,22 @@
 import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
-import { map } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { unwrap, map } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { ofArray, choose } from "../../fable_modules/fable-library-js.4.16.0/List.js";
 import { equals } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
 import { tryInclude } from "../Encode.js";
 import { context_jsonvalue } from "../context/rocrate/property_value_context.js";
 import { string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { OntologyAnnotation } from "../../Core/OntologyAnnotation.js";
+import { AnnotationValue_decoder } from "../OntologyAnnotation.js";
 import { Value } from "../../Core/Process/Value.js";
 
 export function genID(p) {
     const matchValue = p.GetCategory();
     if (matchValue == null) {
-        return `#Empty${() => p.GetAdditionalType()}`;
+        return `#Empty${p.GetAdditionalType()}`;
     }
     else {
-        return `${() => p.GetAdditionalType()}/${matchValue}${p.GetValue()}${p.GetUnit()}`;
+        const t = matchValue;
+        return `${p.GetAdditionalType()}/${t}${p.GetValue()}${p.GetUnit()}`;
     }
 }
 
@@ -75,8 +77,127 @@ export function encoder(pv) {
 
 export function decoder(create) {
     return object((get$) => {
-        let name, objectArg, code, objectArg_1, value, objectArg_2, code_1, objectArg_3, name_1, objectArg_4, code_2, objectArg_5;
-        return create((name = ((objectArg = get$.Optional, objectArg.Field("category", string))), (code = ((objectArg_1 = get$.Optional, objectArg_1.Field("categoryCode", string))), ((name == null) && (code == null)) ? void 0 : OntologyAnnotation.create(name, void 0, code))), (value = ((objectArg_2 = get$.Optional, objectArg_2.Field("value", string))), (code_1 = ((objectArg_3 = get$.Optional, objectArg_3.Field("valueCode", string))), ((value == null) && (code_1 == null)) ? void 0 : Value.fromOptions(value, void 0, code_1))), (name_1 = ((objectArg_4 = get$.Optional, objectArg_4.Field("unit", string))), (code_2 = ((objectArg_5 = get$.Optional, objectArg_5.Field("unitCode", string))), ((name_1 == null) && (code_2 == null)) ? void 0 : OntologyAnnotation.create(name_1, void 0, code_2))));
+        let value, objectArg_4, code_4, objectArg_5;
+        let category;
+        let name;
+        const objectArg = get$.Optional;
+        name = objectArg.Field("category", string);
+        let code;
+        const objectArg_1 = get$.Optional;
+        code = objectArg_1.Field("categoryCode", string);
+        let matchResult, code_1;
+        if (name == null) {
+            if (code != null) {
+                if (code === "") {
+                    matchResult = 0;
+                }
+                else {
+                    matchResult = 2;
+                    code_1 = code;
+                }
+            }
+            else {
+                matchResult = 0;
+            }
+        }
+        else if (code != null) {
+            if (code === "") {
+                matchResult = 1;
+            }
+            else {
+                matchResult = 2;
+                code_1 = code;
+            }
+        }
+        else {
+            matchResult = 1;
+        }
+        switch (matchResult) {
+            case 0: {
+                category = void 0;
+                break;
+            }
+            case 1: {
+                try {
+                    category = OntologyAnnotation.create(name);
+                }
+                catch (err) {
+                    throw new Error(`Error while decoding category (name:${name}): ${err}`);
+                }
+                break;
+            }
+            default:
+                try {
+                    category = OntologyAnnotation.fromTermAnnotation(code_1, unwrap(name));
+                }
+                catch (err_1) {
+                    throw new Error(`Error while decoding category (name:${name}, code:${code_1}): ${err_1}`);
+                }
+        }
+        let unit;
+        let name_1;
+        const objectArg_2 = get$.Optional;
+        name_1 = objectArg_2.Field("unit", string);
+        let code_2;
+        const objectArg_3 = get$.Optional;
+        code_2 = objectArg_3.Field("unitCode", string);
+        let matchResult_1, code_3;
+        if (name_1 == null) {
+            if (code_2 != null) {
+                if (code_2 === "") {
+                    matchResult_1 = 0;
+                }
+                else {
+                    matchResult_1 = 2;
+                    code_3 = code_2;
+                }
+            }
+            else {
+                matchResult_1 = 0;
+            }
+        }
+        else if (code_2 != null) {
+            if (code_2 === "") {
+                matchResult_1 = 1;
+            }
+            else {
+                matchResult_1 = 2;
+                code_3 = code_2;
+            }
+        }
+        else {
+            matchResult_1 = 1;
+        }
+        switch (matchResult_1) {
+            case 0: {
+                unit = void 0;
+                break;
+            }
+            case 1: {
+                try {
+                    unit = OntologyAnnotation.create(name_1);
+                }
+                catch (err_2) {
+                    throw new Error(`Error while decoding unit (name:${name_1}): ${err_2}`);
+                }
+                break;
+            }
+            default:
+                try {
+                    unit = OntologyAnnotation.fromTermAnnotation(code_3, unwrap(name_1));
+                }
+                catch (err_3) {
+                    throw new Error(`Error while decoding unit (name:${name_1}, code:${code_3}): ${err_3}`);
+                }
+        }
+        return create(category, (value = ((objectArg_4 = get$.Optional, objectArg_4.Field("value", AnnotationValue_decoder))), (code_4 = ((objectArg_5 = get$.Optional, objectArg_5.Field("valueCode", string))), ((value == null) && (code_4 == null)) ? void 0 : (() => {
+            try {
+                return Value.fromOptions(value, void 0, code_4);
+            }
+            catch (err_4) {
+                throw new Error(`Error while decoding value ${value},${code_4}: ${err_4}`);
+            }
+        })())), unit);
     });
 }
 

package/Json/Study.js

@@ -13,7 +13,7 @@ import { Comment_ISAJson_decoder, Comment_ISAJson_encoder, Comment_ROCrate_decod
 import { list as list_2, string, object } from "../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { Decode_objectNoAdditionalProperties, Decode_resizeArray } from "./Decode.js";
 import { toFail, printf, toText, replace } from "../fable_modules/fable-library-js.4.16.0/String.js";
-import { Assay_fileNameFromIdentifier, createMissingIdentifier, Study_tryIdentifierFromFileName, Study_tryFileNameFromIdentifier } from "../Core/Helper/Identifier.js";
+import { Study_fileNameFromIdentifier, createMissingIdentifier, Study_tryIdentifierFromFileName, Study_tryFileNameFromIdentifier } from "../Core/Helper/Identifier.js";
 import { Person_removeSourceAssayComments, Person_getSourceAssayIdentifiersFromComments, Person_setSourceAssayComment, ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D, ARCtrl_ArcTables__ArcTables_GetProcesses } from "../Core/Conversion.js";
 import { list as list_1 } from "../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
 import { Process_ISAJson_decoder, Process_ISAJson_encoder, Process_ROCrate_decoder, Process_ROCrate_encoder } from "./Process/Process.js";
@@ -55,7 +55,7 @@ export function Study_encoder(study) {
 
 export const Study_decoder = object((get$) => {
     let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10;
-    return new ArcStudy((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("SubmissionDate", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("PublicReleaseDate", string))), unwrap((arg_11 = Decode_resizeArray(Publication_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Person_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13)))), unwrap((arg_15 = Decode_resizeArray(OntologyAnnotation_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15)))), unwrap((arg_17 = Decode_resizeArray(ArcTable_decoder), (objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17)))), unwrap((arg_19 = Decode_resizeArray(string), (objectArg_9 = get$.Optional, objectArg_9.Field("RegisteredAssayIdentifiers", arg_19)))), unwrap((arg_21 = Decode_resizeArray(Comment_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21)))));
+    return new ArcStudy((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("SubmissionDate", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("PublicReleaseDate", string))), unwrap((arg_11 = Decode_resizeArray(Publication_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Person_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13)))), unwrap((arg_15 = Decode_resizeArray(OntologyAnnotation_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15)))), unwrap((arg_17 = Decode_resizeArray(ArcTable_decoder), (objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17)))), void 0, unwrap((arg_19 = Decode_resizeArray(string), (objectArg_9 = get$.Optional, objectArg_9.Field("RegisteredAssayIdentifiers", arg_19)))), unwrap((arg_21 = Decode_resizeArray(Comment_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21)))));
 });
 
 export function Study_encoderCompressed(stringTable, oaTable, cellTable, study) {
@@ -73,7 +73,7 @@ export function Study_encoderCompressed(stringTable, oaTable, cellTable, study)
 export function Study_decoderCompressed(stringTable, oaTable, cellTable) {
     return object((get$) => {
         let objectArg, objectArg_1, objectArg_2, objectArg_3, objectArg_4, arg_11, objectArg_5, arg_13, objectArg_6, arg_15, objectArg_7, arg_17, objectArg_8, arg_19, objectArg_9, arg_21, objectArg_10;
-        return new ArcStudy((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("SubmissionDate", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("PublicReleaseDate", string))), unwrap((arg_11 = Decode_resizeArray(Publication_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Person_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13)))), unwrap((arg_15 = Decode_resizeArray(OntologyAnnotation_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15)))), unwrap((arg_17 = Decode_resizeArray(ArcTable_decoderCompressed(stringTable, oaTable, cellTable)), (objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17)))), unwrap((arg_19 = Decode_resizeArray(string), (objectArg_9 = get$.Optional, objectArg_9.Field("RegisteredAssayIdentifiers", arg_19)))), unwrap((arg_21 = Decode_resizeArray(Comment_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21)))));
+        return new ArcStudy((objectArg = get$.Required, objectArg.Field("Identifier", string)), unwrap((objectArg_1 = get$.Optional, objectArg_1.Field("Title", string))), unwrap((objectArg_2 = get$.Optional, objectArg_2.Field("Description", string))), unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("SubmissionDate", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("PublicReleaseDate", string))), unwrap((arg_11 = Decode_resizeArray(Publication_decoder), (objectArg_5 = get$.Optional, objectArg_5.Field("Publications", arg_11)))), unwrap((arg_13 = Decode_resizeArray(Person_decoder), (objectArg_6 = get$.Optional, objectArg_6.Field("Contacts", arg_13)))), unwrap((arg_15 = Decode_resizeArray(OntologyAnnotation_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("StudyDesignDescriptors", arg_15)))), unwrap((arg_17 = Decode_resizeArray(ArcTable_decoderCompressed(stringTable, oaTable, cellTable)), (objectArg_8 = get$.Optional, objectArg_8.Field("Tables", arg_17)))), void 0, unwrap((arg_19 = Decode_resizeArray(string), (objectArg_9 = get$.Optional, objectArg_9.Field("RegisteredAssayIdentifiers", arg_19)))), unwrap((arg_21 = Decode_resizeArray(Comment_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("Comments", arg_21)))));
     });
 }
 
@@ -115,7 +115,7 @@ export const Study_ROCrate_decoder = object((get$) => {
         return Array.from(collection);
     }, assays);
     const tables = map((ps) => ARCtrl_ArcTables__ArcTables_fromProcesses_Static_62A3309D(ps).Tables, (arg_6 = list_2(Process_ROCrate_decoder), (objectArg_2 = get$.Optional, objectArg_2.Field("processSequence", arg_6))));
-    return [new ArcStudy(identifier, unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("title", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("description", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("submissionDate", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("publicReleaseDate", string))), unwrap((arg_16 = Decode_resizeArray(Publication_ROCrate_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("publications", arg_16)))), unwrap((arg_18 = Decode_resizeArray(Person_ROCrate_decoder), (objectArg_8 = get$.Optional, objectArg_8.Field("people", arg_18)))), unwrap((arg_20 = Decode_resizeArray(OntologyAnnotation_ROCrate_decoderDefinedTerm), (objectArg_9 = get$.Optional, objectArg_9.Field("studyDesignDescriptors", arg_20)))), unwrap(tables), unwrap(assayIdentifiers), unwrap((arg_22 = Decode_resizeArray(Comment_ROCrate_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("comments", arg_22))))), defaultArg(assays, empty())];
+    return [new ArcStudy(identifier, unwrap((objectArg_3 = get$.Optional, objectArg_3.Field("title", string))), unwrap((objectArg_4 = get$.Optional, objectArg_4.Field("description", string))), unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("submissionDate", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("publicReleaseDate", string))), unwrap((arg_16 = Decode_resizeArray(Publication_ROCrate_decoder), (objectArg_7 = get$.Optional, objectArg_7.Field("publications", arg_16)))), unwrap((arg_18 = Decode_resizeArray(Person_ROCrate_decoder), (objectArg_8 = get$.Optional, objectArg_8.Field("people", arg_18)))), unwrap((arg_20 = Decode_resizeArray(OntologyAnnotation_ROCrate_decoderDefinedTerm), (objectArg_9 = get$.Optional, objectArg_9.Field("studyDesignDescriptors", arg_20)))), unwrap(tables), void 0, unwrap(assayIdentifiers), unwrap((arg_22 = Decode_resizeArray(Comment_ROCrate_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("comments", arg_22))))), defaultArg(assays, empty())];
 });
 
 /**
@@ -123,7 +123,7 @@ export const Study_ROCrate_decoder = object((get$) => {
  */
 export function Study_ISAJson_encoder(assays, s) {
     const study = s.Copy(true);
-    const fileName = Assay_fileNameFromIdentifier(study.Identifier);
+    const fileName = Study_fileNameFromIdentifier(study.Identifier);
     let assays_1;
     const n = [];
     let enumerator = getEnumerator(Study_Helper_getAssayInformation(assays, study));
@@ -227,7 +227,7 @@ export const Study_ISAJson_decoder = Decode_objectNoAdditionalProperties(Study_I
         const collection = map_1((a_1) => a_1.Identifier, arg_11);
         return Array.from(collection);
     }, assays);
-    return [new ArcStudy(identifier, unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("title", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("description", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("submissionDate", string))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("publicReleaseDate", string))), unwrap((arg_21 = Decode_resizeArray(Publication_ISAJson_decoder), (objectArg_9 = get$.Optional, objectArg_9.Field("publications", arg_21)))), unwrap((persons.length === 0) ? void 0 : persons), unwrap((arg_23 = Decode_resizeArray(OntologyAnnotation_ISAJson_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("studyDesignDescriptors", arg_23)))), unwrap(tables), unwrap(assayIdentifiers), unwrap((arg_25 = Decode_resizeArray(Comment_ISAJson_decoder), (objectArg_11 = get$.Optional, objectArg_11.Field("comments", arg_25))))), defaultArg(assays, empty())];
+    return [new ArcStudy(identifier, unwrap((objectArg_5 = get$.Optional, objectArg_5.Field("title", string))), unwrap((objectArg_6 = get$.Optional, objectArg_6.Field("description", string))), unwrap((objectArg_7 = get$.Optional, objectArg_7.Field("submissionDate", string))), unwrap((objectArg_8 = get$.Optional, objectArg_8.Field("publicReleaseDate", string))), unwrap((arg_21 = Decode_resizeArray(Publication_ISAJson_decoder), (objectArg_9 = get$.Optional, objectArg_9.Field("publications", arg_21)))), unwrap((persons.length === 0) ? void 0 : persons), unwrap((arg_23 = Decode_resizeArray(OntologyAnnotation_ISAJson_decoder), (objectArg_10 = get$.Optional, objectArg_10.Field("studyDesignDescriptors", arg_23)))), unwrap(tables), void 0, unwrap(assayIdentifiers), unwrap((arg_25 = Decode_resizeArray(Comment_ISAJson_decoder), (objectArg_11 = get$.Optional, objectArg_11.Field("comments", arg_25))))), defaultArg(assays, empty())];
 });
 
 export function ARCtrl_ArcStudy__ArcStudy_fromJsonString_Static_Z721C83C5(s) {

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/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.
@@ -62,15 +61,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("")]);