@nfdi4plants/arctrl 1.0.0-beta.8 → 1.0.0-beta.9

package/ISA/ISA/JsonTypes/ProtocolParameter.js

@@ -1,8 +1,8 @@
-import { Record, toString } from "../../../fable_modules/fable-library.4.5.0/Types.js";
-import { record_type, option_type, string_type } from "../../../fable_modules/fable-library.4.5.0/Reflection.js";
-import { OntologyAnnotation, OntologyAnnotation_$reflection } from "./OntologyAnnotation.js";
+import { OntologyAnnotation_$reflection, OntologyAnnotation } from "./OntologyAnnotation.js";
 import { bind, map, defaultArg, unwrap } from "../../../fable_modules/fable-library.4.5.0/Option.js";
 import { Option_fromValueWithDefault } from "../Helper.js";
+import { Record, toString } from "../../../fable_modules/fable-library.4.5.0/Types.js";
+import { record_type, option_type, string_type } from "../../../fable_modules/fable-library.4.5.0/Reflection.js";
 
 export class ProtocolParameter extends Record {
     constructor(ID, ParameterName) {
@@ -10,13 +10,60 @@ export class ProtocolParameter extends Record {
         this.ID = ID;
         this.ParameterName = ParameterName;
     }
+    static make(id, parameterName) {
+        return new ProtocolParameter(id, parameterName);
+    }
+    static create(Id, ParameterName) {
+        return ProtocolParameter.make(Id, ParameterName);
+    }
+    static get empty() {
+        return ProtocolParameter.create();
+    }
+    static fromString(term, source, accession, comments) {
+        const oa = OntologyAnnotation.fromString(term, source, accession, unwrap(comments));
+        const parameterName = Option_fromValueWithDefault(OntologyAnnotation.empty, oa);
+        return ProtocolParameter.make(void 0, parameterName);
+    }
+    static toString(pp) {
+        const value = {
+            TermAccessionNumber: "",
+            TermName: "",
+            TermSourceREF: "",
+        };
+        return defaultArg(map((oa) => OntologyAnnotation.toString(oa), pp.ParameterName), value);
+    }
+    get NameText() {
+        const this$ = this;
+        return defaultArg(map((oa) => oa.NameText, this$.ParameterName), "");
+    }
+    get TryNameText() {
+        const this$ = this;
+        return unwrap(bind((oa) => oa.TryNameText, this$.ParameterName));
+    }
+    MapCategory(f) {
+        const this$ = this;
+        return new ProtocolParameter(this$.ID, map(f, this$.ParameterName));
+    }
+    SetCategory(c) {
+        const this$ = this;
+        return new ProtocolParameter(this$.ID, c);
+    }
+    static tryGetNameText(pp) {
+        return pp.TryNameText;
+    }
+    static getNameText(pp) {
+        return defaultArg(ProtocolParameter.tryGetNameText(pp), "");
+    }
+    static nameEqualsString(name, pp) {
+        return pp.NameText === name;
+    }
     Print() {
         const this$ = this;
         return toString(this$);
     }
     PrintCompact() {
         const this$ = this;
-        return "OA " + ProtocolParameter__get_NameText(this$);
+        return "OA " + this$.NameText;
     }
 }
 
@@ -24,78 +71,3 @@ export function ProtocolParameter_$reflection() {
     return record_type("ARCtrl.ISA.ProtocolParameter", [], ProtocolParameter, () => [["ID", option_type(string_type)], ["ParameterName", option_type(OntologyAnnotation_$reflection())]]);
 }
 
-export function ProtocolParameter_make(id, parameterName) {
-    return new ProtocolParameter(id, parameterName);
-}
-
-export function ProtocolParameter_create_Z6C54B221(Id, ParameterName) {
-    return ProtocolParameter_make(Id, ParameterName);
-}
-
-export function ProtocolParameter_get_empty() {
-    return ProtocolParameter_create_Z6C54B221();
-}
-
-/**
- * Create a ISAJson Protocol Parameter from ISATab string entries
- */
-export function ProtocolParameter_fromString_Z2304A83C(term, source, accession, comments) {
-    const oa = OntologyAnnotation.fromString(term, source, accession, unwrap(comments));
-    return ProtocolParameter_make(void 0, Option_fromValueWithDefault(OntologyAnnotation.empty, oa));
-}
-
-/**
- * Get ISATab string entries from an ISAJson ProtocolParameter object (name,source,accession)
- */
-export function ProtocolParameter_toString_Z3A4310A5(pp) {
-    const value = {
-        TermAccessionNumber: "",
-        TermName: "",
-        TermSourceREF: "",
-    };
-    return defaultArg(map((oa) => OntologyAnnotation.toString(oa), pp.ParameterName), value);
-}
-
-/**
- * Returns the name of the parameter as string
- */
-export function ProtocolParameter__get_NameText(this$) {
-    return defaultArg(map((oa) => oa.NameText, this$.ParameterName), "");
-}
-
-/**
- * Returns the name of the parameter as string
- */
-export function ProtocolParameter__get_TryNameText(this$) {
-    return bind((oa) => oa.TryNameText, this$.ParameterName);
-}
-
-export function ProtocolParameter__MapCategory_Z69DD836A(this$, f) {
-    return new ProtocolParameter(this$.ID, map(f, this$.ParameterName));
-}
-
-export function ProtocolParameter__SetCategory_Z4C0FE73C(this$, c) {
-    return new ProtocolParameter(this$.ID, c);
-}
-
-/**
- * Returns the name of the paramater as string if it exists
- */
-export function ProtocolParameter_tryGetNameText_Z3A4310A5(pp) {
-    return ProtocolParameter__get_TryNameText(pp);
-}
-
-/**
- * Returns the name of the paramater as string
- */
-export function ProtocolParameter_getNameText_Z3A4310A5(pp) {
-    return defaultArg(ProtocolParameter_tryGetNameText_Z3A4310A5(pp), "");
-}
-
-/**
- * Returns true if the given name matches the name of the parameter
- */
-export function ProtocolParameter_nameEqualsString(name, pp) {
-    return ProtocolParameter__get_NameText(pp) === name;
-}
-

package/ISA/ISA/JsonTypes/Value.js

@@ -1,12 +1,12 @@
-import { Union, toString } from "../../../fable_modules/fable-library.4.5.0/Types.js";
-import { printf, toText } from "../../../fable_modules/fable-library.4.5.0/String.js";
-import { OntologyAnnotation, OntologyAnnotation_$reflection } from "./OntologyAnnotation.js";
-import { union_type, string_type, float64_type, int32_type } from "../../../fable_modules/fable-library.4.5.0/Reflection.js";
 import { parse } from "../../../fable_modules/fable-library.4.5.0/Double.js";
 import { parse as parse_1 } from "../../../fable_modules/fable-library.4.5.0/Int32.js";
+import { OntologyAnnotation_$reflection, OntologyAnnotation } from "./OntologyAnnotation.js";
 import { map, defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
 import { int32ToString } from "../../../fable_modules/fable-library.4.5.0/Util.js";
 import { AnnotationValue_toString_Z6FAD7738 } from "./AnnotationValue.js";
+import { Union, toString } from "../../../fable_modules/fable-library.4.5.0/Types.js";
+import { printf, toText } from "../../../fable_modules/fable-library.4.5.0/String.js";
+import { union_type, string_type, float64_type, int32_type } from "../../../fable_modules/fable-library.4.5.0/Reflection.js";
 
 export class Value extends Union {
     constructor(tag, fields) {
@@ -17,194 +17,129 @@ export class Value extends Union {
     cases() {
         return ["Ontology", "Int", "Float", "Name"];
     }
-    Print() {
-        const this$ = this;
-        return toString(this$);
-    }
-    PrintCompact() {
-        const this$ = this;
-        return (this$.tag === 1) ? toText(printf("%i"))(this$.fields[0]) : ((this$.tag === 2) ? toText(printf("%f"))(this$.fields[0]) : ((this$.tag === 3) ? this$.fields[0] : this$.fields[0].NameText));
-    }
-}
-
-export function Value_$reflection() {
-    return union_type("ARCtrl.ISA.Value", [], Value, () => [[["Item", OntologyAnnotation_$reflection()]], [["Item", int32_type]], [["Item", float64_type]], [["Item", string_type]]]);
-}
-
-export function Value_fromString_Z721C83C5(value) {
-    try {
-        return new Value(1, [parse_1(value, 511, false, 32)]);
-    }
-    catch (matchValue) {
+    static fromString(value) {
         try {
-            return new Value(2, [parse(value)]);
+            return new Value(1, [parse_1(value, 511, false, 32)]);
         }
-        catch (matchValue_1) {
-            return new Value(3, [value]);
+        catch (matchValue) {
+            try {
+                return new Value(2, [parse(value)]);
+            }
+            catch (matchValue_1) {
+                return new Value(3, [value]);
+            }
         }
     }
-}
-
-export function Value_fromOptions(value, termSource, termAccesssion) {
-    let matchResult, value_1;
-    if (value == null) {
-        if (termSource == null) {
-            if (termAccesssion == null) {
-                matchResult = 1;
+    static fromOptions(value, termSource, termAccesssion) {
+        let value_1;
+        return (value == null) ? ((termSource == null) ? ((termAccesssion == null) ? void 0 : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)]))) : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)]))) : ((termSource == null) ? ((termAccesssion == null) ? ((value_1 = value, (() => {
+            try {
+                return new Value(1, [parse_1(value_1, 511, false, 32)]);
+            }
+            catch (matchValue_1) {
+                try {
+                    return new Value(2, [parse(value_1)]);
+                }
+                catch (matchValue_2) {
+                    return new Value(3, [value_1]);
+                }
             }
-            else {
-                matchResult = 2;
+        })())) : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)]))) : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)])));
+    }
+    static toOptions(value) {
+        switch (value.tag) {
+            case 1:
+                return [int32ToString(value.fields[0]), void 0, void 0];
+            case 2:
+                return [value.fields[0].toString(), void 0, void 0];
+            case 3:
+                return [value.fields[0], void 0, void 0];
+            default: {
+                const oa = value.fields[0];
+                return [map(AnnotationValue_toString_Z6FAD7738, oa.Name), oa.TermAccessionNumber, oa.TermSourceREF];
             }
         }
+    }
+    get Text() {
+        const this$ = this;
+        return (this$.tag === 2) ? this$.fields[0].toString() : ((this$.tag === 1) ? int32ToString(this$.fields[0]) : ((this$.tag === 3) ? this$.fields[0] : this$.fields[0].NameText));
+    }
+    AsName() {
+        const this$ = this;
+        if (this$.tag === 3) {
+            return this$.fields[0];
+        }
         else {
-            matchResult = 2;
+            throw new Error(`Value ${this$} is not of case name`);
         }
     }
-    else if (termSource == null) {
-        if (termAccesssion == null) {
-            matchResult = 0;
-            value_1 = value;
+    AsInt() {
+        const this$ = this;
+        if (this$.tag === 1) {
+            return this$.fields[0] | 0;
         }
         else {
-            matchResult = 2;
+            throw new Error(`Value ${this$} is not of case int`);
         }
     }
-    else {
-        matchResult = 2;
-    }
-    switch (matchResult) {
-        case 0:
-            return (() => {
-                try {
-                    return new Value(1, [parse_1(value_1, 511, false, 32)]);
-                }
-                catch (matchValue_1) {
-                    try {
-                        return new Value(2, [parse(value_1)]);
-                    }
-                    catch (matchValue_2) {
-                        return new Value(3, [value_1]);
-                    }
-                }
-            })();
-        case 1:
-            return void 0;
-        default:
-            return new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)]);
-    }
-}
-
-export function Value_toOptions_72E9EF0F(value) {
-    switch (value.tag) {
-        case 1:
-            return [int32ToString(value.fields[0]), void 0, void 0];
-        case 2:
-            return [value.fields[0].toString(), void 0, void 0];
-        case 3:
-            return [value.fields[0], void 0, void 0];
-        default: {
-            const oa = value.fields[0];
-            return [map(AnnotationValue_toString_Z6FAD7738, oa.Name), oa.TermAccessionNumber, oa.TermSourceREF];
+    AsFloat() {
+        const this$ = this;
+        if (this$.tag === 2) {
+            return this$.fields[0];
+        }
+        else {
+            throw new Error(`Value ${this$} is not of case float`);
         }
     }
-}
-
-export function Value__get_Text(this$) {
-    switch (this$.tag) {
-        case 2:
-            return this$.fields[0].toString();
-        case 1:
-            return int32ToString(this$.fields[0]);
-        case 3:
+    AsOntology() {
+        const this$ = this;
+        if (this$.tag === 0) {
             return this$.fields[0];
-        default:
-            return this$.fields[0].NameText;
-    }
-}
-
-export function Value__AsName(this$) {
-    if (this$.tag === 3) {
-        return this$.fields[0];
-    }
-    else {
-        throw new Error(`Value ${this$} is not of case name`);
-    }
-}
-
-export function Value__AsInt(this$) {
-    if (this$.tag === 1) {
-        return this$.fields[0] | 0;
-    }
-    else {
-        throw new Error(`Value ${this$} is not of case int`);
-    }
-}
-
-export function Value__AsFloat(this$) {
-    if (this$.tag === 2) {
-        return this$.fields[0];
-    }
-    else {
-        throw new Error(`Value ${this$} is not of case float`);
-    }
-}
-
-export function Value__AsOntology(this$) {
-    if (this$.tag === 0) {
-        return this$.fields[0];
-    }
-    else {
-        throw new Error(`Value ${this$} is not of case ontology`);
-    }
-}
-
-export function Value__get_IsAnOntology(this$) {
-    if (this$.tag === 0) {
-        return true;
+        }
+        else {
+            throw new Error(`Value ${this$} is not of case ontology`);
+        }
     }
-    else {
-        return false;
+    get IsAnOntology() {
+        const this$ = this;
+        return this$.tag === 0;
     }
-}
-
-export function Value__get_IsNumerical(this$) {
-    switch (this$.tag) {
-        case 1:
-        case 2:
-            return true;
-        default:
-            return false;
+    get IsNumerical() {
+        const this$ = this;
+        switch (this$.tag) {
+            case 1:
+            case 2:
+                return true;
+            default:
+                return false;
+        }
     }
-}
-
-export function Value__get_IsAnInt(this$) {
-    if (this$.tag === 1) {
-        return true;
+    get IsAnInt() {
+        const this$ = this;
+        return this$.tag === 1;
     }
-    else {
-        return false;
+    get IsAFloat() {
+        const this$ = this;
+        return this$.tag === 2;
     }
-}
-
-export function Value__get_IsAFloat(this$) {
-    if (this$.tag === 2) {
-        return true;
+    get IsAText() {
+        const this$ = this;
+        return this$.tag === 3;
     }
-    else {
-        return false;
+    static getText(v) {
+        return v.Text;
     }
-}
-
-export function Value__get_IsAText(this$) {
-    if (this$.tag === 3) {
-        return true;
+    Print() {
+        const this$ = this;
+        return toString(this$);
     }
-    else {
-        return false;
+    PrintCompact() {
+        const this$ = this;
+        return (this$.tag === 1) ? toText(printf("%i"))(this$.fields[0]) : ((this$.tag === 2) ? toText(printf("%f"))(this$.fields[0]) : ((this$.tag === 3) ? this$.fields[0] : this$.fields[0].NameText));
     }
 }
 
-export function Value_getText_72E9EF0F(v) {
-    return Value__get_Text(v);
+export function Value_$reflection() {
+    return union_type("ARCtrl.ISA.Value", [], Value, () => [[["Item", OntologyAnnotation_$reflection()]], [["Item", int32_type]], [["Item", float64_type]], [["Item", string_type]]]);
 }
 

package/ISA/ISA/Regex.js

@@ -1,6 +1,10 @@
 import { create, match } from "../../fable_modules/fable-library.4.5.0/RegExp.js";
-import { value as value_1, map, some } from "../../fable_modules/fable-library.4.5.0/Option.js";
 import { parse } from "../../fable_modules/fable-library.4.5.0/Int32.js";
+import { map } from "../../fable_modules/fable-library.4.5.0/Option.js";
+
+export function Pattern_handleGroupPatterns(pattern) {
+    return pattern;
+}
 
 export const Pattern_ExcelNumberFormat = `"(?<${"numberFormat"}>(.*?))"`;
 
@@ -20,7 +24,7 @@ export const Pattern_OutputPattern = `Output\\s\\[(?<${"iotype"}>.+)\\]`;
  * Matches, if the input string matches the given regex pattern.
  */
 export function ActivePatterns_$007CRegex$007C_$007C(pattern, input) {
-    const m = match(create(pattern), input.trim());
+    const m = match(create(Pattern_handleGroupPatterns(pattern)), input.trim());
     if (m != null) {
         return m;
     }
@@ -66,8 +70,10 @@ export function ActivePatterns_$007CTermColumn$007C_$007C(input) {
  * Matches a "Unit" column header.
  */
 export function ActivePatterns_$007CUnitColumnHeader$007C_$007C(input) {
-    if (ActivePatterns_$007CRegex$007C_$007C("Unit", input) != null) {
-        return some(void 0);
+    const activePatternResult = ActivePatterns_$007CRegex$007C_$007C("Unit", input);
+    if (activePatternResult != null) {
+        const o = activePatternResult;
+        return o[0];
     }
     else {
         return void 0;
@@ -462,8 +468,8 @@ export function tryParseTermColumn(input) {
 export function tryParseUnitColumnHeader(input) {
     const activePatternResult = ActivePatterns_$007CUnitColumnHeader$007C_$007C(input);
     if (activePatternResult != null) {
-        const r = value_1(activePatternResult);
-        return some(void 0);
+        const r = activePatternResult;
+        return r;
     }
     else {
         return void 0;

package/ISA/ISA.Json/Process.js

@@ -1,6 +1,6 @@
 import { replace } from "../../fable_modules/fable-library.4.5.0/String.js";
-import { ProtocolParameter_getNameText_Z3A4310A5 } from "../ISA/JsonTypes/ProtocolParameter.js";
-import { Value_getText_72E9EF0F } from "../ISA/JsonTypes/Value.js";
+import { ProtocolParameter } from "../ISA/JsonTypes/ProtocolParameter.js";
+import { Value } from "../ISA/JsonTypes/Value.js";
 import { list as list_2, toString, nil, object as object_22 } from "../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
 import { map, choose } from "../../fable_modules/fable-library.4.5.0/List.js";
 import { uncurry2, equals } from "../../fable_modules/fable-library.4.5.0/Util.js";
@@ -41,7 +41,7 @@ export function ProcessParameterValue_genID(p) {
     }
     switch (matchResult) {
         case 0:
-            return (("#Param_" + replace(ProtocolParameter_getNameText_Z3A4310A5(c), " ", "_")) + "_") + replace(Value_getText_72E9EF0F(v), " ", "_");
+            return (("#Param_" + replace(ProtocolParameter.getNameText(c), " ", "_")) + "_") + replace(Value.getText(v), " ", "_");
         default:
             return "#EmptyParameterValue";
     }

package/ISA/ISA.Spreadsheet/ArcInvestigation.js

@@ -14,7 +14,7 @@ import { toRows as toRows_1, fromRows as fromRows_1 } from "./Metadata/OntologyS
 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, collect, singleton, append as append_1, delay } from "../../fable_modules/fable-library.4.5.0/Seq.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.0.1/FsWorksheet.fs.js";
@@ -242,12 +242,12 @@ export function fromRows(rows) {
     }
 }
 
-export function toRows(investigation) {
+export function toRows(isLight, investigation) {
     let remarks, rows;
-    return (remarks = ofArray(investigation.Remarks), (rows = delay(() => append_1(singleton(SparseRowModule_fromValues(["ONTOLOGY SOURCE REFERENCE"])), delay(() => append_1(toRows_1(ofArray(investigation.OntologySourceReferences)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION"])), delay(() => append_1(InvestigationInfo_toRows_Z4D87C88C(investigation), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION PUBLICATIONS"])), delay(() => append_1(toRows_2("Investigation Publication", ofArray(investigation.Publications)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION CONTACTS"])), delay(() => append_1(toRows_3("Investigation Person", ofArray(investigation.Contacts)), delay(() => collect((studyIdentifier) => {
+    return (remarks = ofArray(investigation.Remarks), (rows = delay(() => append_1(singleton(SparseRowModule_fromValues(["ONTOLOGY SOURCE REFERENCE"])), delay(() => append_1(toRows_1(ofArray(investigation.OntologySourceReferences)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION"])), delay(() => append_1(InvestigationInfo_toRows_Z4D87C88C(investigation), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION PUBLICATIONS"])), delay(() => append_1(toRows_2("Investigation Publication", ofArray(investigation.Publications)), delay(() => append_1(singleton(SparseRowModule_fromValues(["INVESTIGATION CONTACTS"])), delay(() => append_1(toRows_3("Investigation Person", ofArray(investigation.Contacts)), delay(() => (!isLight ? collect((studyIdentifier) => {
         const study = defaultArg(investigation.TryGetStudy(studyIdentifier), new ArcStudy(studyIdentifier));
         return append_1(singleton(SparseRowModule_fromValues(["STUDY"])), delay(() => toRows_4(study, void 0)));
-    }, investigation.RegisteredStudyIdentifiers)))))))))))))))))), (() => {
+    }, investigation.RegisteredStudyIdentifiers) : empty_1())))))))))))))))))), (() => {
         try {
             const rm = ofList(map((remark) => Remark.toTuple(remark), remarks), {
                 Compare: comparePrimitives,
@@ -305,7 +305,23 @@ export function toFsWorkbook(investigation) {
         const sheet = new FsWorksheet("isa_investigation");
         iterateIndexed((rowI, r) => {
             SparseRowModule_writeToSheet(rowI + 1, r, sheet);
-        }, toRows(investigation));
+        }, toRows(false, investigation));
+        wb.AddWorksheet(sheet);
+        return wb;
+    }
+    catch (err) {
+        const arg = err.message;
+        return toFail(printf("Could not write investigation to spreadsheet: %s"))(arg);
+    }
+}
+
+export function toLightFsWorkbook(investigation) {
+    try {
+        const wb = new FsWorkbook();
+        const sheet = new FsWorksheet("isa_investigation");
+        iterateIndexed((rowI, r) => {
+            SparseRowModule_writeToSheet(rowI + 1, r, sheet);
+        }, toRows(true, investigation));
         wb.AddWorksheet(sheet);
         return wb;
     }

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

@@ -6,7 +6,7 @@ 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 { Array_map4 } from "../CollectionAux.js";
 import { Component_toString_Z609B8895, Component_fromString_Z61E08C1 } from "../../ISA/JsonTypes/Component.js";
-import { ProtocolParameter_toString_Z3A4310A5, ProtocolParameter_make } from "../../ISA/JsonTypes/ProtocolParameter.js";
+import { ProtocolParameter } from "../../ISA/JsonTypes/ProtocolParameter.js";
 
 /**
  * If the value matches the default, a None is returned, else a Some is returned
@@ -145,7 +145,7 @@ export function Component_toAggregatedStrings(separator, cs) {
  * Returns a list of ISAJson ProtocolParameter objects from ISATab aggregated strings
  */
 export function ProtocolParameter_fromAggregatedStrings(separator, terms, source, accessions) {
-    return map((arg) => ((parameterName) => ProtocolParameter_make(void 0, parameterName))(arg), OntologyAnnotation_fromAggregatedStrings(separator, terms, source, accessions));
+    return map((arg) => ((parameterName) => ProtocolParameter.make(void 0, parameterName))(arg), OntologyAnnotation_fromAggregatedStrings(separator, terms, source, accessions));
 }
 
 /**
@@ -169,7 +169,7 @@ export function ProtocolParameter_toAggregatedStrings(separator, oas) {
             else {
                 return [toText(printf("%s%c%s"))(tupledArg[0])(separator)(term.TermName), toText(printf("%s%c%s"))(tupledArg[1])(separator)(term.TermSourceREF), toText(printf("%s%c%s"))(tupledArg[2])(separator)(term.TermAccessionNumber)];
             }
-        }, ["", "", ""], map_1(ProtocolParameter_toString_Z3A4310A5, oas));
+        }, ["", "", ""], map_1((pp) => ProtocolParameter.toString(pp), oas));
         return {
             TermAccessionNumberAgg: tupledArg_1[2],
             TermNameAgg: tupledArg_1[0],

package/SemVer.js

@@ -1,14 +1,12 @@
-import { match, create } from "./fable_modules/fable-library.4.5.0/RegExp.js";
 import { toString, Record } from "./fable_modules/fable-library.4.5.0/Types.js";
 import { record_type, option_type, string_type, int32_type } from "./fable_modules/fable-library.4.5.0/Reflection.js";
+import { ActivePatterns_$007CRegex$007C_$007C } from "./ISA/ISA/Regex.js";
 import { parse } from "./fable_modules/fable-library.4.5.0/Int32.js";
 import { value as value_3, unwrap } from "./fable_modules/fable-library.4.5.0/Option.js";
 import { StringBuilder__Append_Z721C83C5, StringBuilder_$ctor } from "./fable_modules/fable-library.4.5.0/System.Text.js";
 import { printf, toText } from "./fable_modules/fable-library.4.5.0/String.js";
 
-const SemVerAux_Pattern = "^(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(-(?<pre>[0-9A-Za-z-\\.]+))?(\\+(?<build>[0-9A-Za-z-\\.]+))?$";
-
-export const SemVerAux_SemVerRegex = create(SemVerAux_Pattern);
+export const SemVerAux_Pattern = "^(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(-(?<pre>[0-9A-Za-z-\\.]+))?(\\+(?<build>[0-9A-Za-z-\\.]+))?$";
 
 export class SemVer extends Record {
     constructor(Major, Minor, Patch, PreRelease, Metadata) {
@@ -34,9 +32,9 @@ export function SemVer_create_Z55658624(major, minor, patch, pre, meta) {
 }
 
 export function SemVer_tryOfString_Z721C83C5(str) {
-    const m = match(SemVerAux_SemVerRegex, str);
-    const matchValue = m != null;
-    if (matchValue) {
+    const activePatternResult = ActivePatterns_$007CRegex$007C_$007C(SemVerAux_Pattern, str);
+    if (activePatternResult != null) {
+        const m = activePatternResult;
         const g = m;
         return SemVer_create_Z55658624(parse((g.groups && g.groups.major) || "", 511, false, 32), parse((g.groups && g.groups.minor) || "", 511, false, 32), parse((g.groups && g.groups.patch) || "", 511, false, 32), unwrap(((g.groups && g.groups.pre) != null) ? ((g.groups && g.groups.pre) || "") : void 0), unwrap(((g.groups && g.groups.build) != null) ? ((g.groups && g.groups.build) || "") : void 0));
     }