@nfdi4plants/arctrl 1.0.7 → 1.2.0

package/ISA/ISA.Spreadsheet/ArcAssay.js

@@ -1,16 +1,16 @@
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.1.2/FsWorksheet.fs.js";
-import { iterate, isEmpty as isEmpty_1, choose, tryHead, head, exists, map, singleton, append, delay, iterateIndexed } from "../../fable_modules/fable-library.4.5.0/Seq.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.1.3/FsWorksheet.fs.js";
+import { iterate, isEmpty as isEmpty_1, choose, tryHead, head, exists, map, singleton, append, delay, iterateIndexed } from "../../fable_modules/fable-library-js.4.13.0/Seq.js";
 import { SparseRowModule_tryGetValueAt, SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
 import { fromRows as fromRows_1, toRows as toRows_1 } from "./Metadata/Assays.js";
-import { empty, isEmpty, toArray, ofArray, singleton as singleton_1 } from "../../fable_modules/fable-library.4.5.0/List.js";
+import { empty, isEmpty, toArray, ofArray, singleton as singleton_1 } from "../../fable_modules/fable-library-js.4.13.0/List.js";
 import { fromRows as fromRows_2, toRows as toRows_2 } from "./Metadata/Contacts.js";
-import { getEnumerator } from "../../fable_modules/fable-library.4.5.0/Util.js";
+import { toConsole, printf, toFail } from "../../fable_modules/fable-library-js.4.13.0/String.js";
+import { getEnumerator } from "../../fable_modules/fable-library-js.4.13.0/Util.js";
 import { ArcAssay } from "../ISA/ArcTypes/ArcTypes.js";
 import { createMissingIdentifier } from "../ISA/Identifier.js";
-import { defaultArg } from "../../fable_modules/fable-library.4.5.0/Option.js";
-import { printf, toConsole } from "../../fable_modules/fable-library.4.5.0/String.js";
+import { defaultArg } from "../../fable_modules/fable-library-js.4.13.0/Option.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
-import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.5.1.2/FsWorkbook.fs.js";
+import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.5.1.3/FsWorkbook.fs.js";
 
 export function toMetadataSheet(assay) {
     let assay_1;
@@ -22,89 +22,95 @@ export function toMetadataSheet(assay) {
 }
 
 export function fromMetadataSheet(sheet) {
-    const rows_1 = map(SparseRowModule_fromFsRow, sheet.Rows);
-    const patternInput = exists((row) => {
-        const s = head(row)[1];
-        return s.indexOf("Assay") === 0;
-    }, rows_1) ? ["Assay", "Assay Person"] : [void 0, void 0];
-    const en = getEnumerator(rows_1);
-    const loop = (lastLine_mut, assays_mut, contacts_mut, lineNumber_mut) => {
-        let k;
-        loop:
-        while (true) {
-            const lastLine = lastLine_mut, assays = assays_mut, contacts = contacts_mut, lineNumber = lineNumber_mut;
-            let matchResult, k_2, k_3, k_4;
-            if (lastLine != null) {
-                if ((k = lastLine, (k === "ASSAY") ? true : (k === "ASSAY METADATA"))) {
-                    matchResult = 0;
-                    k_2 = lastLine;
-                }
-                else if (lastLine === "ASSAY PERFORMERS") {
-                    matchResult = 1;
-                    k_3 = lastLine;
+    try {
+        const rows_1 = map(SparseRowModule_fromFsRow, sheet.Rows);
+        const patternInput = exists((row) => {
+            const s = head(row)[1];
+            return s.indexOf("Assay") === 0;
+        }, rows_1) ? ["Assay", "Assay Person"] : [void 0, void 0];
+        const en = getEnumerator(rows_1);
+        const loop = (lastLine_mut, assays_mut, contacts_mut, lineNumber_mut) => {
+            let k;
+            loop:
+            while (true) {
+                const lastLine = lastLine_mut, assays = assays_mut, contacts = contacts_mut, lineNumber = lineNumber_mut;
+                let matchResult, k_2, k_3, k_4;
+                if (lastLine != null) {
+                    if ((k = lastLine, (k === "ASSAY") ? true : (k === "ASSAY METADATA"))) {
+                        matchResult = 0;
+                        k_2 = lastLine;
+                    }
+                    else if (lastLine === "ASSAY PERFORMERS") {
+                        matchResult = 1;
+                        k_3 = lastLine;
+                    }
+                    else {
+                        matchResult = 2;
+                        k_4 = lastLine;
+                    }
                 }
                 else {
                     matchResult = 2;
                     k_4 = lastLine;
                 }
-            }
-            else {
-                matchResult = 2;
-                k_4 = lastLine;
-            }
-            switch (matchResult) {
-                case 0: {
-                    const patternInput_1 = fromRows_1(patternInput[0], lineNumber + 1, en);
-                    lastLine_mut = patternInput_1[0];
-                    assays_mut = patternInput_1[3];
-                    contacts_mut = contacts;
-                    lineNumber_mut = patternInput_1[1];
-                    continue loop;
-                }
-                case 1: {
-                    const patternInput_2 = fromRows_2(patternInput[1], lineNumber + 1, en);
-                    lastLine_mut = patternInput_2[0];
-                    assays_mut = assays;
-                    contacts_mut = patternInput_2[3];
-                    lineNumber_mut = patternInput_2[1];
-                    continue loop;
-                }
-                default: {
-                    let matchResult_1, assays_2, contacts_2;
-                    if (isEmpty(assays)) {
-                        if (isEmpty(contacts)) {
-                            matchResult_1 = 0;
+                switch (matchResult) {
+                    case 0: {
+                        const patternInput_1 = fromRows_1(patternInput[0], lineNumber + 1, en);
+                        lastLine_mut = patternInput_1[0];
+                        assays_mut = patternInput_1[3];
+                        contacts_mut = contacts;
+                        lineNumber_mut = patternInput_1[1];
+                        continue loop;
+                    }
+                    case 1: {
+                        const patternInput_2 = fromRows_2(patternInput[1], lineNumber + 1, en);
+                        lastLine_mut = patternInput_2[0];
+                        assays_mut = assays;
+                        contacts_mut = patternInput_2[3];
+                        lineNumber_mut = patternInput_2[1];
+                        continue loop;
+                    }
+                    default: {
+                        let matchResult_1, assays_2, contacts_2;
+                        if (isEmpty(assays)) {
+                            if (isEmpty(contacts)) {
+                                matchResult_1 = 0;
+                            }
+                            else {
+                                matchResult_1 = 1;
+                                assays_2 = assays;
+                                contacts_2 = contacts;
+                            }
                         }
                         else {
                             matchResult_1 = 1;
                             assays_2 = assays;
                             contacts_2 = contacts;
                         }
-                    }
-                    else {
-                        matchResult_1 = 1;
-                        assays_2 = assays;
-                        contacts_2 = contacts;
-                    }
-                    switch (matchResult_1) {
-                        case 0:
-                            return ArcAssay.create(createMissingIdentifier());
-                        default: {
-                            const performers = toArray(contacts_2);
-                            const assay = defaultArg(tryHead(assays_2), ArcAssay.create(createMissingIdentifier()));
-                            return ArcAssay.setPerformers(performers, assay);
+                        switch (matchResult_1) {
+                            case 0:
+                                return ArcAssay.create(createMissingIdentifier());
+                            default: {
+                                const performers = toArray(contacts_2);
+                                const assay = defaultArg(tryHead(assays_2), ArcAssay.create(createMissingIdentifier()));
+                                return ArcAssay.setPerformers(performers, assay);
+                            }
                         }
                     }
                 }
+                break;
             }
-            break;
+        };
+        if (en["System.Collections.IEnumerator.MoveNext"]()) {
+            return loop(SparseRowModule_tryGetValueAt(0, en["System.Collections.Generic.IEnumerator`1.get_Current"]()), empty(), empty(), 1);
+        }
+        else {
+            throw new Error("empty assay metadata sheet");
         }
-    };
-    if (en["System.Collections.IEnumerator.MoveNext"]()) {
-        return loop(SparseRowModule_tryGetValueAt(0, en["System.Collections.Generic.IEnumerator`1.get_Current"]()), empty(), empty(), 1);
     }
-    else {
-        throw new Error("empty assay metadata sheet");
+    catch (err) {
+        const arg = err.message;
+        return toFail(printf("Failed while parsing metadatasheet: %s"))(arg);
     }
 }
 
@@ -112,26 +118,32 @@ export function fromMetadataSheet(sheet) {
  * Reads an assay from a spreadsheet
  */
 export function fromFsWorkbook(doc) {
-    let assayMetaData;
-    const matchValue = doc.TryGetWorksheetByName("isa_assay");
-    if (matchValue == null) {
-        const matchValue_1 = doc.TryGetWorksheetByName("Assay");
-        if (matchValue_1 == null) {
-            toConsole(printf("Cannot retrieve metadata: Assay file does not contain \"%s\" or \"%s\" sheet."))("isa_assay")("Assay");
-            assayMetaData = ArcAssay.create(createMissingIdentifier());
+    try {
+        let assayMetaData;
+        const matchValue = doc.TryGetWorksheetByName("isa_assay");
+        if (matchValue == null) {
+            const matchValue_1 = doc.TryGetWorksheetByName("Assay");
+            if (matchValue_1 == null) {
+                toConsole(printf("Cannot retrieve metadata: Assay file does not contain \"%s\" or \"%s\" sheet."))("isa_assay")("Assay");
+                assayMetaData = ArcAssay.create(createMissingIdentifier());
+            }
+            else {
+                assayMetaData = fromMetadataSheet(matchValue_1);
+            }
         }
         else {
-            assayMetaData = fromMetadataSheet(matchValue_1);
+            assayMetaData = fromMetadataSheet(matchValue);
         }
+        const annotationTables = choose(tryFromFsWorksheet, doc.GetWorksheets());
+        if (!isEmpty_1(annotationTables)) {
+            assayMetaData.Tables = Array.from(annotationTables);
+        }
+        return assayMetaData;
     }
-    else {
-        assayMetaData = fromMetadataSheet(matchValue);
-    }
-    const annotationTables = choose(tryFromFsWorksheet, doc.GetWorksheets());
-    if (!isEmpty_1(annotationTables)) {
-        assayMetaData.Tables = Array.from(annotationTables);
+    catch (err) {
+        const arg_2 = err.message;
+        return toFail(printf("Could not parse assay: \n%s"))(arg_2);
     }
-    return assayMetaData;
 }
 
 export function toFsWorkbook(assay) {

package/ISA/ISA.Spreadsheet/ArcInvestigation.js

@@ -1,24 +1,24 @@
-import { Record } from "../../fable_modules/fable-library.4.5.0/Types.js";
-import { record_type, list_type, string_type } from "../../fable_modules/fable-library.4.5.0/Reflection.js";
+import { Record } from "../../fable_modules/fable-library-js.4.13.0/Types.js";
+import { record_type, list_type, string_type } from "../../fable_modules/fable-library-js.4.13.0/Reflection.js";
 import { Remark, Comment$_$reflection } from "../ISA/JsonTypes/Comment.js";
-import { ofSeq, head, tail, isEmpty, concat, unzip, append, toArray, reverse, cons, empty, map, ofArray } from "../../fable_modules/fable-library.4.5.0/List.js";
+import { ofSeq, head, tail, isEmpty, concat, unzip, append, toArray, reverse, cons, empty, map, ofArray } from "../../fable_modules/fable-library-js.4.13.0/List.js";
 import { Remark_wrapRemark, Comment_toString, Comment_fromString } from "./Metadata/Comment.js";
 import { SparseRowModule_writeToSheet, SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_tryGetValueAt, SparseTable_ToRows_6A3D4534, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValueDefault_5BAE6133 } from "./Metadata/SparseTable.js";
-import { addToDict } from "../../fable_modules/fable-library.4.5.0/MapUtil.js";
-import { value as value_1, defaultArg } from "../../fable_modules/fable-library.4.5.0/Option.js";
-import { List_distinctBy, List_distinct } from "../../fable_modules/fable-library.4.5.0/Seq2.js";
-import { comparePrimitives, getEnumerator, stringHash } from "../../fable_modules/fable-library.4.5.0/Util.js";
+import { addToDict } from "../../fable_modules/fable-library-js.4.13.0/MapUtil.js";
+import { value as value_1, defaultArg } from "../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { List_distinctBy, List_distinct } from "../../fable_modules/fable-library-js.4.13.0/Seq2.js";
+import { comparePrimitives, getEnumerator, stringHash } from "../../fable_modules/fable-library-js.4.13.0/Util.js";
 import { Option_fromValueWithDefault } from "./Metadata/Conversions.js";
 import { ArcStudy, ArcInvestigation } from "../ISA/ArcTypes/ArcTypes.js";
 import { toRows as toRows_1, fromRows as fromRows_1 } from "./Metadata/OntologySourceReference.js";
 import { toRows as toRows_2, fromRows as fromRows_2 } from "./Metadata/Publication.js";
 import { toRows as toRows_3, fromRows as fromRows_3 } from "./Metadata/Contacts.js";
 import { toRows as toRows_4, fromRows as fromRows_4 } from "./Metadata/Study.js";
-import { iterateIndexed, map as map_1, toList, empty as empty_1, collect, singleton, append as append_1, delay } from "../../fable_modules/fable-library.4.5.0/Seq.js";
-import { tryFind, ofList } from "../../fable_modules/fable-library.4.5.0/Map.js";
-import { printf, toFail } from "../../fable_modules/fable-library.4.5.0/String.js";
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.1.2/FsWorksheet.fs.js";
-import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.5.1.2/FsWorkbook.fs.js";
+import { iterateIndexed, map as map_1, toList, empty as empty_1, collect, singleton, append as append_1, delay } from "../../fable_modules/fable-library-js.4.13.0/Seq.js";
+import { tryFind, ofList } from "../../fable_modules/fable-library-js.4.13.0/Map.js";
+import { printf, toFail } from "../../fable_modules/fable-library-js.4.13.0/String.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.1.3/FsWorksheet.fs.js";
+import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.5.1.3/FsWorkbook.fs.js";
 
 export class InvestigationInfo extends Record {
     constructor(Identifier, Title, Description, SubmissionDate, PublicReleaseDate, Comments) {

package/ISA/ISA.Spreadsheet/ArcStudy.js

@@ -1,16 +1,16 @@
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.1.2/FsWorksheet.fs.js";
-import { map, append, iterateIndexed } from "../../fable_modules/fable-library.4.5.0/Seq.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.1.3/FsWorksheet.fs.js";
+import { map, append, iterateIndexed } from "../../fable_modules/fable-library-js.4.13.0/Seq.js";
 import { SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
 import { fromRows as fromRows_1, toRows } from "./Metadata/Study.js";
-import { defaultArg } from "../../fable_modules/fable-library.4.5.0/Option.js";
-import { getEnumerator } from "../../fable_modules/fable-library.4.5.0/Util.js";
+import { toConsole, printf, toFail } from "../../fable_modules/fable-library-js.4.13.0/String.js";
+import { defaultArg } from "../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { getEnumerator } from "../../fable_modules/fable-library-js.4.13.0/Util.js";
 import { ArcStudy } from "../ISA/ArcTypes/ArcTypes.js";
 import { createMissingIdentifier } from "../ISA/Identifier.js";
-import { empty } from "../../fable_modules/fable-library.4.5.0/List.js";
-import { printf, toConsole } from "../../fable_modules/fable-library.4.5.0/String.js";
+import { empty } from "../../fable_modules/fable-library-js.4.13.0/List.js";
 import { ResizeArray_iter, ResizeArray_isEmpty, ResizeArray_choose } from "../ISA/Helper.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
-import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.5.1.2/FsWorkbook.fs.js";
+import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.5.1.3/FsWorkbook.fs.js";
 
 export function ArcStudy_toMetadataSheet(study, assays) {
     let source_1;
@@ -23,34 +23,46 @@ export function ArcStudy_toMetadataSheet(study, assays) {
 
 export function ArcStudy_fromMetadataSheet(sheet) {
     let en;
-    return defaultArg((en = getEnumerator(map(SparseRowModule_fromFsRow, sheet.Rows)), (void en["System.Collections.IEnumerator.MoveNext"](), fromRows_1(2, en)[3])), [ArcStudy.create(createMissingIdentifier()), empty()]);
+    try {
+        return defaultArg((en = getEnumerator(map(SparseRowModule_fromFsRow, sheet.Rows)), (void en["System.Collections.IEnumerator.MoveNext"](), fromRows_1(2, en)[3])), [ArcStudy.create(createMissingIdentifier()), empty()]);
+    }
+    catch (err) {
+        const arg = err.message;
+        return toFail(printf("Failed while parsing metadatasheet: %s"))(arg);
+    }
 }
 
 /**
  * Reads an assay from a spreadsheet
  */
 export function ARCtrl_ISA_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D(doc) {
-    let patternInput;
-    const matchValue = doc.TryGetWorksheetByName("isa_study");
-    if (matchValue == null) {
-        const matchValue_1 = doc.TryGetWorksheetByName("Study");
-        if (matchValue_1 == null) {
-            toConsole(printf("Cannot retrieve metadata: Study file does not contain \"%s\" or \"%s\" sheet."))("isa_study")("Study");
-            patternInput = [ArcStudy.create(createMissingIdentifier()), empty()];
+    try {
+        let patternInput;
+        const matchValue = doc.TryGetWorksheetByName("isa_study");
+        if (matchValue == null) {
+            const matchValue_1 = doc.TryGetWorksheetByName("Study");
+            if (matchValue_1 == null) {
+                toConsole(printf("Cannot retrieve metadata: Study file does not contain \"%s\" or \"%s\" sheet."))("isa_study")("Study");
+                patternInput = [ArcStudy.create(createMissingIdentifier()), empty()];
+            }
+            else {
+                patternInput = ArcStudy_fromMetadataSheet(matchValue_1);
+            }
         }
         else {
-            patternInput = ArcStudy_fromMetadataSheet(matchValue_1);
+            patternInput = ArcStudy_fromMetadataSheet(matchValue);
         }
+        const studyMetadata = patternInput[0];
+        const annotationTables = ResizeArray_choose(tryFromFsWorksheet, doc.GetWorksheets());
+        if (!ResizeArray_isEmpty(annotationTables)) {
+            studyMetadata.Tables = annotationTables;
+        }
+        return [studyMetadata, patternInput[1]];
     }
-    else {
-        patternInput = ArcStudy_fromMetadataSheet(matchValue);
-    }
-    const studyMetadata = patternInput[0];
-    const annotationTables = ResizeArray_choose(tryFromFsWorksheet, doc.GetWorksheets());
-    if (!ResizeArray_isEmpty(annotationTables)) {
-        studyMetadata.Tables = annotationTables;
+    catch (err) {
+        const arg_2 = err.message;
+        return toFail(printf("Could not parse study: \n%s"))(arg_2);
     }
-    return [studyMetadata, patternInput[1]];
 }
 
 export function ARCtrl_ISA_ArcStudy__ArcStudy_toFsWorkbook_Static_Z2A9662E9(study, assays) {

package/ISA/ISA.Spreadsheet/CollectionAux.js

@@ -1,10 +1,10 @@
-import { tryFind, maxBy, skip } from "../../fable_modules/fable-library.4.5.0/Seq.js";
-import { tryItem, skip as skip_1, initialize } from "../../fable_modules/fable-library.4.5.0/Array.js";
-import { defaultOf, comparePrimitives } from "../../fable_modules/fable-library.4.5.0/Util.js";
-import { some, value } from "../../fable_modules/fable-library.4.5.0/Option.js";
-import { empty, tail, cons, head, reverse, isEmpty, tryPick } from "../../fable_modules/fable-library.4.5.0/List.js";
-import { tryGetValue } from "../../fable_modules/fable-library.4.5.0/MapUtil.js";
-import { FSharpRef } from "../../fable_modules/fable-library.4.5.0/Types.js";
+import { tryFind, maxBy, skip } from "../../fable_modules/fable-library-js.4.13.0/Seq.js";
+import { item, tryItem, skip as skip_1, initialize } from "../../fable_modules/fable-library-js.4.13.0/Array.js";
+import { defaultOf, comparePrimitives } from "../../fable_modules/fable-library-js.4.13.0/Util.js";
+import { some, value } from "../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { empty, tail, cons, head, reverse, isEmpty, tryPick } from "../../fable_modules/fable-library-js.4.13.0/List.js";
+import { tryGetValue } from "../../fable_modules/fable-library-js.4.13.0/MapUtil.js";
+import { FSharpRef } from "../../fable_modules/fable-library-js.4.13.0/Types.js";
 
 /**
  * If at least i values exist in seq a, builds a new array that contains the elements of the given seq, exluding the first i elements
@@ -62,7 +62,7 @@ export function Array_map4(f, aa, ba, ca, da) {
     if (!(((aa.length === ba.length) && (ba.length === ca.length)) && (ca.length === da.length))) {
         throw new Error("");
     }
-    return initialize(aa.length, (i) => f(aa[i], ba[i], ca[i], da[i]));
+    return initialize(aa.length, (i) => f(item(i, aa), item(i, ba), item(i, ca), item(i, da)));
 }
 
 export function List_tryPickDefault(chooser, d, list) {

package/ISA/ISA.Spreadsheet/Metadata/Assays.js

@@ -1,14 +1,14 @@
-import { reverse, cons, iterateIndexed, empty, map as map_1, toArray, initialize, singleton, length, ofArray } from "../../../fable_modules/fable-library.4.5.0/List.js";
+import { reverse, cons, iterateIndexed, empty, map as map_1, toArray, initialize, singleton, length, ofArray } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
 import { OntologyAnnotation } from "../../ISA/JsonTypes/OntologyAnnotation.js";
 import { Option_fromValueWithDefault } from "./Conversions.js";
-import { unwrap, defaultArg, map } from "../../../fable_modules/fable-library.4.5.0/Option.js";
+import { unwrap, defaultArg, map } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
 import { ArcAssay } from "../../ISA/ArcTypes/ArcTypes.js";
 import { SparseTable_ToRows_6A3D4534, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValue_11FD62A8, SparseTable__TryGetValueDefault_5BAE6133, SparseTable_GetEmptyComments_651559CC } from "./SparseTable.js";
 import { Assay_fileNameFromIdentifier, removeMissingIdentifier, Assay_identifierFromFileName, createMissingIdentifier } from "../../ISA/Identifier.js";
 import { Comment_toString, Comment_fromString } from "./Comment.js";
-import { addToDict } from "../../../fable_modules/fable-library.4.5.0/MapUtil.js";
-import { List_distinct } from "../../../fable_modules/fable-library.4.5.0/Seq2.js";
-import { stringHash } from "../../../fable_modules/fable-library.4.5.0/Util.js";
+import { addToDict } from "../../../fable_modules/fable-library-js.4.13.0/MapUtil.js";
+import { List_distinct } from "../../../fable_modules/fable-library-js.4.13.0/Seq2.js";
+import { stringHash } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
 
 export const labels = ofArray(["Measurement Type", "Measurement Type Term Accession Number", "Measurement Type Term Source REF", "Technology Type", "Technology Type Term Accession Number", "Technology Type Term Source REF", "Technology Platform", "File Name"]);
 

package/ISA/ISA.Spreadsheet/Metadata/Comment.js

@@ -1,29 +1,37 @@
-import { defaultArg, bind } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { match } from "../../../fable_modules/fable-library.4.5.0/RegExp.js";
-import { printf, toText } from "../../../fable_modules/fable-library.4.5.0/String.js";
+import { ActivePatterns_$007CRegex$007C_$007C } from "../../ISA/Regex.js";
+import { printf, toText } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
 import { Option_fromValueWithDefault } from "./Conversions.js";
 import { Comment$ } from "../../ISA/JsonTypes/Comment.js";
+import { bind, defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
 
-export const Comment_commentRegex = /(?<=Comment\[<).*(?=>\])/gu;
+export const Comment_commentValueKey = "commentValue";
 
-export const Comment_commentRegexNoAngleBrackets = /(?<=Comment\[).*(?=\])/gu;
+export const Comment_commentPattern = `Comment\\s*\\[<(?<${Comment_commentValueKey}>.+)>\\]`;
+
+export const Comment_commentPatternNoAngleBrackets = `Comment\\s*\\[(?<${Comment_commentValueKey}>.+)\\]`;
 
 export function Comment_$007CComment$007C_$007C(key) {
-    return bind((k) => {
-        const r = match(Comment_commentRegex, k);
-        if (r != null) {
-            return r[0];
-        }
-        else {
-            const r_1 = match(Comment_commentRegexNoAngleBrackets, k);
-            if (r_1 != null) {
-                return r_1[0];
+    const activePatternResult = ActivePatterns_$007CRegex$007C_$007C(Comment_commentPattern, key);
+    if (activePatternResult != null) {
+        const r = activePatternResult;
+        return (r.groups && r.groups[Comment_commentValueKey]) || "";
+    }
+    else {
+        const activePatternResult_1 = ActivePatterns_$007CRegex$007C_$007C(Comment_commentPatternNoAngleBrackets, key);
+        if (activePatternResult_1 != null) {
+            const r_1 = activePatternResult_1;
+            const v = (r_1.groups && r_1.groups[Comment_commentValueKey]) || "";
+            if (v === "<>") {
+                return void 0;
             }
             else {
-                return void 0;
+                return v;
             }
         }
-    }, key);
+        else {
+            return void 0;
+        }
+    }
 }
 
 export function Comment_wrapCommentKey(k) {
@@ -40,13 +48,16 @@ export function Comment_toString(c) {
     return [defaultArg(c.Name, ""), defaultArg(c.Value, "")];
 }
 
-export const Remark_remarkRegex = /(?<=#).*/gu;
+export const Remark_remarkValueKey = "remarkValue";
+
+export const Remark_remarkPattern = `#(?<${Remark_remarkValueKey}>.+)`;
 
 export function Remark_$007CRemark$007C_$007C(key) {
     return bind((k) => {
-        const r = match(Remark_remarkRegex, k);
-        if (r != null) {
-            return r[0];
+        const activePatternResult = ActivePatterns_$007CRegex$007C_$007C(Remark_remarkPattern, k);
+        if (activePatternResult != null) {
+            const r = activePatternResult;
+            return (r.groups && r.groups[Remark_remarkValueKey]) || "";
         }
         else {
             return void 0;

package/ISA/ISA.Spreadsheet/Metadata/Contacts.js

@@ -1,12 +1,12 @@
-import { reverse, cons, iterateIndexed, empty, map, toArray, initialize, singleton, length, ofArray } from "../../../fable_modules/fable-library.4.5.0/List.js";
+import { reverse, cons, iterateIndexed, empty, map, toArray, initialize, singleton, length, ofArray } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
 import { OntologyAnnotation_toAggregatedStrings, OntologyAnnotation_fromAggregatedStrings, Option_fromValueWithDefault } from "./Conversions.js";
 import { Person } from "../../ISA/JsonTypes/Person.js";
 import { SparseTable_ToRows_6A3D4534, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValue_11FD62A8, SparseTable__TryGetValueDefault_5BAE6133, SparseTable_GetEmptyComments_651559CC } from "./SparseTable.js";
 import { Comment_toString, Comment_fromString } from "./Comment.js";
-import { unwrap, defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { addToDict } from "../../../fable_modules/fable-library.4.5.0/MapUtil.js";
-import { List_distinct } from "../../../fable_modules/fable-library.4.5.0/Seq2.js";
-import { stringHash } from "../../../fable_modules/fable-library.4.5.0/Util.js";
+import { unwrap, defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { addToDict } from "../../../fable_modules/fable-library-js.4.13.0/MapUtil.js";
+import { List_distinct } from "../../../fable_modules/fable-library-js.4.13.0/Seq2.js";
+import { stringHash } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
 
 export const lastNameLabel = "Last Name";
 

package/ISA/ISA.Spreadsheet/Metadata/Conversions.js

@@ -1,9 +1,9 @@
-import { equals } from "../../../fable_modules/fable-library.4.5.0/Util.js";
-import { value, some } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { map, equalsWith, fill, map3, fold } from "../../../fable_modules/fable-library.4.5.0/Array.js";
-import { toText, printf, toFail } from "../../../fable_modules/fable-library.4.5.0/String.js";
+import { equals } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
+import { value, some } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { map, equalsWith, fill, map3, fold } from "../../../fable_modules/fable-library-js.4.13.0/Array.js";
+import { toText, printf, toFail } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
 import { OntologyAnnotation } from "../../ISA/JsonTypes/OntologyAnnotation.js";
-import { map as map_1, fold as fold_1, ofArray, empty } from "../../../fable_modules/fable-library.4.5.0/List.js";
+import { map as map_1, fold as fold_1, ofArray, empty } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
 import { Array_map4 } from "../CollectionAux.js";
 import { Component_toString_Z609B8895, Component_fromString_Z61E08C1 } from "../../ISA/JsonTypes/Component.js";
 import { ProtocolParameter } from "../../ISA/JsonTypes/ProtocolParameter.js";

package/ISA/ISA.Spreadsheet/Metadata/DesignDescriptors.js

@@ -1,4 +1,4 @@
-import { ofArray } from "../../../fable_modules/fable-library.4.5.0/List.js";
+import { ofArray } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
 import { toRows as toRows_1, fromRows as fromRows_1, toSparseTable as toSparseTable_1, fromSparseTable as fromSparseTable_1 } from "./OntologyAnnotation.js";
 
 export const designTypeLabel = "Type";

package/ISA/ISA.Spreadsheet/Metadata/Factors.js

@@ -1,13 +1,13 @@
-import { reverse, cons, iterateIndexed, empty, map, toArray, initialize, singleton, length, ofArray } from "../../../fable_modules/fable-library.4.5.0/List.js";
+import { reverse, cons, iterateIndexed, empty, map, toArray, initialize, singleton, length, ofArray } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
 import { OntologyAnnotation } from "../../ISA/JsonTypes/OntologyAnnotation.js";
 import { Option_fromValueWithDefault } from "./Conversions.js";
 import { Factor } from "../../ISA/JsonTypes/Factor.js";
 import { SparseTable_ToRows_6A3D4534, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValue_11FD62A8, SparseTable__TryGetValueDefault_5BAE6133, SparseTable_GetEmptyComments_651559CC } from "./SparseTable.js";
 import { Comment_toString, Comment_fromString } from "./Comment.js";
-import { defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { addToDict } from "../../../fable_modules/fable-library.4.5.0/MapUtil.js";
-import { List_distinct } from "../../../fable_modules/fable-library.4.5.0/Seq2.js";
-import { stringHash } from "../../../fable_modules/fable-library.4.5.0/Util.js";
+import { defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { addToDict } from "../../../fable_modules/fable-library-js.4.13.0/MapUtil.js";
+import { List_distinct } from "../../../fable_modules/fable-library-js.4.13.0/Seq2.js";
+import { stringHash } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
 
 export const nameLabel = "Name";
 

package/ISA/ISA.Spreadsheet/Metadata/OntologyAnnotation.js

@@ -1,12 +1,12 @@
-import { reverse, cons, iterateIndexed, empty, ofArray, map, toArray, initialize, singleton, length } from "../../../fable_modules/fable-library.4.5.0/List.js";
+import { reverse, cons, iterateIndexed, empty, ofArray, map, toArray, initialize, singleton, length } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
 import { SparseTable_ToRows_6A3D4534, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValue_11FD62A8, SparseTable__TryGetValueDefault_5BAE6133, SparseTable_GetEmptyComments_651559CC } from "./SparseTable.js";
 import { OntologyAnnotation } from "../../ISA/JsonTypes/OntologyAnnotation.js";
 import { Option_fromValueWithDefault } from "./Conversions.js";
 import { Comment_toString, Comment_fromString } from "./Comment.js";
-import { unwrap } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { addToDict } from "../../../fable_modules/fable-library.4.5.0/MapUtil.js";
-import { List_distinct } from "../../../fable_modules/fable-library.4.5.0/Seq2.js";
-import { stringHash } from "../../../fable_modules/fable-library.4.5.0/Util.js";
+import { unwrap } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { addToDict } from "../../../fable_modules/fable-library-js.4.13.0/MapUtil.js";
+import { List_distinct } from "../../../fable_modules/fable-library-js.4.13.0/Seq2.js";
+import { stringHash } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
 
 export function fromSparseTable(label, labelTSR, labelTAN, matrix) {
     if ((matrix.ColumnCount === 0) && (length(matrix.CommentKeys) !== 0)) {

package/ISA/ISA.Spreadsheet/Metadata/OntologySourceReference.js

@@ -1,12 +1,12 @@
-import { reverse, cons, iterateIndexed, empty, map, toArray, initialize, singleton, length, ofArray } from "../../../fable_modules/fable-library.4.5.0/List.js";
+import { reverse, cons, iterateIndexed, empty, map, toArray, initialize, singleton, length, ofArray } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
 import { Option_fromValueWithDefault } from "./Conversions.js";
 import { OntologySourceReference } from "../../ISA/JsonTypes/OntologySourceReference.js";
 import { SparseTable_ToRows_6A3D4534, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValue_11FD62A8, SparseTable__TryGetValueDefault_5BAE6133, SparseTable_GetEmptyComments_651559CC } from "./SparseTable.js";
 import { Comment_toString, Comment_fromString } from "./Comment.js";
-import { addToDict } from "../../../fable_modules/fable-library.4.5.0/MapUtil.js";
-import { defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { List_distinct } from "../../../fable_modules/fable-library.4.5.0/Seq2.js";
-import { stringHash } from "../../../fable_modules/fable-library.4.5.0/Util.js";
+import { addToDict } from "../../../fable_modules/fable-library-js.4.13.0/MapUtil.js";
+import { defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { List_distinct } from "../../../fable_modules/fable-library-js.4.13.0/Seq2.js";
+import { stringHash } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
 
 export const nameLabel = "Term Source Name";