@nfdi4plants/arctrl 1.2.0 → 2.0.0-alpha.1

package/Core/Process/Component.js

@@ -0,0 +1,188 @@
+import { Record } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
+import { Value, Value_$reflection } from "./Value.js";
+import { record_type, option_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { OntologyAnnotation, OntologyAnnotation_$reflection } from "../OntologyAnnotation.js";
+import { defaultArg, unwrap, map } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { ActivePatterns_$007CRegex$007C_$007C } from "../Helper/Regex.js";
+import { Option_fromValueWithDefault } from "../Helper/Collections.js";
+import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
+
+export class Component extends Record {
+    constructor(ComponentValue, ComponentUnit, ComponentType) {
+        super();
+        this.ComponentValue = ComponentValue;
+        this.ComponentUnit = ComponentUnit;
+        this.ComponentType = ComponentType;
+    }
+    GetCategory() {
+        const this$ = this;
+        return this$.ComponentType;
+    }
+    GetAdditionalType() {
+        return "Component";
+    }
+    GetValue() {
+        const this$ = this;
+        return this$.ComponentValue;
+    }
+    GetUnit() {
+        const this$ = this;
+        return this$.ComponentUnit;
+    }
+}
+
+export function Component_$reflection() {
+    return record_type("ARCtrl.Process.Component", [], Component, () => [["ComponentValue", option_type(Value_$reflection())], ["ComponentUnit", option_type(OntologyAnnotation_$reflection())], ["ComponentType", option_type(OntologyAnnotation_$reflection())]]);
+}
+
+export function Component__get_ComponentName(this$) {
+    return map((v) => Component_composeName(v, this$.ComponentUnit), this$.ComponentValue);
+}
+
+export function Component_make(value, unit, componentType) {
+    return new Component(value, unit, componentType);
+}
+
+export function Component_create_4208F9FC(value, unit, componentType) {
+    return Component_make(value, unit, componentType);
+}
+
+export function Component_get_empty() {
+    return Component_create_4208F9FC();
+}
+
+/**
+ * This function creates a string containing full isa term triplet information about the component
+ * 
+ * Components do not have enough fields in ISA-JSON to include all existing ontology term information.
+ * This function allows us, to add the same information as `Parameter`, `Characteristics`.., to `Component`.
+ * Without this string composition we loose the ontology information for the header value.
+ */
+export function Component_composeName(value, unit) {
+    if (value.tag === 0) {
+        const oa = value.fields[0];
+        return `${oa.NameText} (${oa.TermAccessionShort})`;
+    }
+    else if (unit != null) {
+        const u = unit;
+        return `${value.Text} ${u.NameText} (${u.TermAccessionShort})`;
+    }
+    else {
+        return `${value.Text}`;
+    }
+}
+
+/**
+ * This function parses the given Component header string format into the ISA-JSON Component type
+ * 
+ * Components do not have enough fields in ISA-JSON to include all existing ontology term information.
+ * This function allows us, to add the same information as `Parameter`, `Characteristics`.., to `Component`.
+ * Without this string composition we loose the ontology information for the header value.
+ */
+export function Component_decomposeName_Z721C83C5(name) {
+    const activePatternResult = ActivePatterns_$007CRegex$007C_$007C("^(?<value>[\\d\\.]+) (?<unit>.+) \\((?<ontology>[^(]*:[^)]*)\\)", name);
+    if (activePatternResult != null) {
+        const unitr = activePatternResult;
+        let oa;
+        const tan = (unitr.groups && unitr.groups.ontology) || "";
+        oa = OntologyAnnotation.fromTermAnnotation(tan);
+        let v;
+        const value = (unitr.groups && unitr.groups.value) || "";
+        v = Value.fromString(value);
+        const u = (unitr.groups && unitr.groups.unit) || "";
+        oa.Name = u;
+        return [v, oa];
+    }
+    else {
+        const activePatternResult_1 = ActivePatterns_$007CRegex$007C_$007C("^(?<value>[^\\(]+) \\((?<ontology>[^(]*:[^)]*)\\)", name);
+        if (activePatternResult_1 != null) {
+            const r = activePatternResult_1;
+            let oa_1;
+            const tan_1 = (r.groups && r.groups.ontology) || "";
+            oa_1 = OntologyAnnotation.fromTermAnnotation(tan_1);
+            const v_1 = (r.groups && r.groups.value) || "";
+            oa_1.Name = v_1;
+            return [new Value(0, [oa_1]), void 0];
+        }
+        else {
+            const activePatternResult_2 = ActivePatterns_$007CRegex$007C_$007C("^(?<value>[^\\(\\)]+) \\(\\)", name);
+            if (activePatternResult_2 != null) {
+                const r_1 = activePatternResult_2;
+                return [new Value(0, [new OntologyAnnotation((r_1.groups && r_1.groups.value) || "")]), void 0];
+            }
+            else {
+                return [new Value(3, [name]), void 0];
+            }
+        }
+    }
+}
+
+/**
+ * Create a ISAJson Component from ISATab string entries
+ */
+export function Component_fromISAString_7C9A7CF8(name, term, source, accession, comments) {
+    let cType;
+    const v = OntologyAnnotation.create(unwrap(term), unwrap(source), unwrap(accession), unwrap(comments));
+    cType = Option_fromValueWithDefault(new OntologyAnnotation(), v);
+    if (name == null) {
+        return Component_make(void 0, void 0, cType);
+    }
+    else {
+        const patternInput = Component_decomposeName_Z721C83C5(name);
+        return Component_make(Option_fromValueWithDefault(new Value(3, [""]), patternInput[0]), patternInput[1], cType);
+    }
+}
+
+/**
+ * Get ISATab string entries from an ISAJson Component object
+ */
+export function Component_toStringObject_Z685B8F25(c) {
+    let oa_1;
+    const value = {
+        TermAccessionNumber: "",
+        TermName: "",
+        TermSourceREF: "",
+    };
+    oa_1 = defaultArg(map((oa) => OntologyAnnotation.toStringObject(oa), c.ComponentType), value);
+    return [defaultArg(Component__get_ComponentName(c), ""), oa_1];
+}
+
+export function Component__get_NameText(this$) {
+    return defaultArg(map((c) => c.NameText, this$.ComponentType), "");
+}
+
+/**
+ * Returns the ontology of the category of the Value as string
+ */
+export function Component__get_UnitText(this$) {
+    return defaultArg(map((c) => c.NameText, this$.ComponentUnit), "");
+}
+
+export function Component__get_ValueText(this$) {
+    return defaultArg(map((c) => c.Text, this$.ComponentValue), "");
+}
+
+export function Component__get_ValueWithUnitText(this$) {
+    const unit = map((oa) => oa.NameText, this$.ComponentUnit);
+    const v = Component__get_ValueText(this$);
+    if (unit == null) {
+        return v;
+    }
+    else {
+        const u = unit;
+        return toText(printf("%s %s"))(v)(u);
+    }
+}
+
+export function Component__MapCategory_658CFBF6(this$, f) {
+    return new Component(this$.ComponentValue, this$.ComponentUnit, map(f, this$.ComponentType));
+}
+
+export function Component__SetCategory_ZDED3A0F(this$, c) {
+    return new Component(this$.ComponentValue, this$.ComponentUnit, c);
+}
+
+export function Component_createAsPV(category, value, unit) {
+    return Component_create_4208F9FC(unwrap(value), unwrap(unit), unwrap(category));
+}
+

package/{ISA/ISA/JsonTypes → Core/Process}/Data.js

@@ -1,9 +1,9 @@
-import { Record, toString } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
-import { printf, toText } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
+import { Record, toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
+import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { DataFile_$reflection, DataFile__get_AsString } from "./DataFile.js";
-import { record_type, list_type, option_type, string_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
-import { Comment$_$reflection } from "./Comment.js";
-import { defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { record_type, list_type, option_type, string_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { Comment$_$reflection } from "../Comment.js";
+import { defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 
 export class Data extends Record {
     constructor(ID, Name, DataType, Comments) {
@@ -34,19 +34,19 @@ export class Data extends Record {
 }
 
 export function Data_$reflection() {
-    return record_type("ARCtrl.ISA.Data", [], Data, () => [["ID", option_type(string_type)], ["Name", option_type(string_type)], ["DataType", option_type(DataFile_$reflection())], ["Comments", option_type(list_type(Comment$_$reflection()))]]);
+    return record_type("ARCtrl.Process.Data", [], Data, () => [["ID", option_type(string_type)], ["Name", option_type(string_type)], ["DataType", option_type(DataFile_$reflection())], ["Comments", option_type(list_type(Comment$_$reflection()))]]);
 }
 
 export function Data_make(id, name, dataType, comments) {
     return new Data(id, name, dataType, comments);
 }
 
-export function Data_create_Z326CF519(Id, Name, DataType, Comments) {
+export function Data_create_Z2AF98BBE(Id, Name, DataType, Comments) {
     return Data_make(Id, Name, DataType, Comments);
 }
 
 export function Data_get_empty() {
-    return Data_create_Z326CF519();
+    return Data_create_Z2AF98BBE();
 }
 
 export function Data__get_NameAsString(this$) {

package/{ISA/ISA/JsonTypes → Core/Process}/DataFile.js

@@ -1,5 +1,5 @@
-import { Union } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
-import { union_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
+import { Union } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
+import { union_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 
 export class DataFile extends Union {
     constructor(tag, fields) {
@@ -13,7 +13,7 @@ export class DataFile extends Union {
 }
 
 export function DataFile_$reflection() {
-    return union_type("ARCtrl.ISA.DataFile", [], DataFile, () => [[], [], []]);
+    return union_type("ARCtrl.Process.DataFile", [], DataFile, () => [[], [], []]);
 }
 
 export function DataFile_get_RawDataFileJson() {

package/Core/Process/Factor.js

@@ -0,0 +1,109 @@
+import { OntologyAnnotation_$reflection, OntologyAnnotation } from "../OntologyAnnotation.js";
+import { map, defaultArg, unwrap } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { ResizeArray_map, Option_fromValueWithDefault } from "../Helper/Collections.js";
+import { filter, singleton, append, exists, tryFind } 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 { Record, toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
+import { record_type, array_type, option_type, string_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { Comment$_$reflection } from "../Comment.js";
+
+export class Factor extends Record {
+    constructor(Name, FactorType, Comments) {
+        super();
+        this.Name = Name;
+        this.FactorType = FactorType;
+        this.Comments = Comments;
+    }
+    static make(name, factorType, comments) {
+        return new Factor(name, factorType, comments);
+    }
+    static create(Name, FactorType, Comments) {
+        return Factor.make(Name, FactorType, Comments);
+    }
+    static get empty() {
+        return Factor.create();
+    }
+    static fromString(name, term, source, accession, comments) {
+        const oa = OntologyAnnotation.create(term, source, accession, unwrap(comments));
+        const name_1 = Option_fromValueWithDefault("", name);
+        const factorType = Option_fromValueWithDefault(new OntologyAnnotation(), oa);
+        return Factor.make(name_1, factorType, void 0);
+    }
+    static toStringObject(factor) {
+        const value = {
+            TermAccessionNumber: "",
+            TermName: "",
+            TermSourceREF: "",
+        };
+        return defaultArg(map((oa) => OntologyAnnotation.toStringObject(oa), factor.FactorType), value);
+    }
+    get NameText() {
+        const this$ = this;
+        return defaultArg(this$.Name, "");
+    }
+    MapCategory(f) {
+        const this$ = this;
+        return new Factor(this$.Name, map(f, this$.FactorType), this$.Comments);
+    }
+    SetCategory(c) {
+        const this$ = this;
+        return new Factor(this$.Name, c, this$.Comments);
+    }
+    static tryGetByName(name, factors) {
+        return tryFind((f) => equals(f.Name, name), factors);
+    }
+    static existsByName(name, factors) {
+        return exists((f) => equals(f.Name, name), factors);
+    }
+    static add(factors, factor) {
+        return append(factors, singleton(factor));
+    }
+    static removeByName(name, factors) {
+        return filter((f) => !equals(f.Name, name), factors);
+    }
+    static getComments(factor) {
+        return factor.Comments;
+    }
+    static mapComments(f, factor) {
+        return new Factor(factor.Name, factor.FactorType, map(f, factor.Comments));
+    }
+    static setComments(factor, comments) {
+        return new Factor(factor.Name, factor.FactorType, comments);
+    }
+    static getFactorType(factor) {
+        return factor.FactorType;
+    }
+    static mapFactorType(f, factor) {
+        return new Factor(factor.Name, map(f, factor.FactorType), factor.Comments);
+    }
+    static setFactorType(factor, factorType) {
+        return new Factor(factor.Name, factorType, factor.Comments);
+    }
+    static tryGetName(f) {
+        return f.Name;
+    }
+    static getNameAsString(f) {
+        return f.NameText;
+    }
+    static nameEqualsString(name, f) {
+        return f.NameText === name;
+    }
+    Copy() {
+        const this$ = this;
+        const comments = map((a) => ResizeArray_map((c) => c.Copy(), a), this$.Comments);
+        return Factor.make(this$.Name, this$.FactorType, comments);
+    }
+    Print() {
+        const this$ = this;
+        return toString(this$);
+    }
+    PrintCompact() {
+        const this$ = this;
+        return "OA " + this$.NameText;
+    }
+}
+
+export function Factor_$reflection() {
+    return record_type("ARCtrl.Process.Factor", [], Factor, () => [["Name", option_type(string_type)], ["FactorType", option_type(OntologyAnnotation_$reflection())], ["Comments", option_type(array_type(Comment$_$reflection()))]]);
+}
+

package/{ISA/ISA/JsonTypes → Core/Process}/FactorValue.js

@@ -1,11 +1,11 @@
-import { Record, toString } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
-import { defaultArg, map } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
-import { record_type, option_type, string_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
+import { Record, toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
+import { unwrap, defaultArg, bind, map } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { record_type, option_type, string_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { Factor, Factor_$reflection } from "./Factor.js";
 import { Value_$reflection } from "./Value.js";
-import { OntologyAnnotation_$reflection } from "./OntologyAnnotation.js";
-import { int32ToString } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
-import { printf, toText } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
+import { OntologyAnnotation_$reflection } from "../OntologyAnnotation.js";
+import { int32ToString } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
+import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 
 export class FactorValue extends Record {
     constructor(ID, Category, Value, Unit) {
@@ -35,22 +35,37 @@ export class FactorValue extends Record {
         }, this$.Value);
         return (category == null) ? ((value == null) ? "" : ((value_2 = value, value_2))) : ((value == null) ? ((category_2 = category, (category_2 + ":") + "No Value")) : ((category_1 = category, (value_1 = value, (category_1 + ":") + value_1))));
     }
+    GetCategory() {
+        const this$ = this;
+        return bind((f) => f.FactorType, this$.Category);
+    }
+    GetValue() {
+        const this$ = this;
+        return this$.Value;
+    }
+    GetUnit() {
+        const this$ = this;
+        return this$.Unit;
+    }
+    GetAdditionalType() {
+        return "FactorValue";
+    }
 }
 
 export function FactorValue_$reflection() {
-    return record_type("ARCtrl.ISA.FactorValue", [], FactorValue, () => [["ID", option_type(string_type)], ["Category", option_type(Factor_$reflection())], ["Value", option_type(Value_$reflection())], ["Unit", option_type(OntologyAnnotation_$reflection())]]);
+    return record_type("ARCtrl.Process.FactorValue", [], FactorValue, () => [["ID", option_type(string_type)], ["Category", option_type(Factor_$reflection())], ["Value", option_type(Value_$reflection())], ["Unit", option_type(OntologyAnnotation_$reflection())]]);
 }
 
 export function FactorValue_make(id, category, value, unit) {
     return new FactorValue(id, category, value, unit);
 }
 
-export function FactorValue_create_18335379(Id, Category, Value, Unit) {
+export function FactorValue_create_29259B2C(Id, Category, Value, Unit) {
     return FactorValue_make(Id, Category, Value, Unit);
 }
 
 export function FactorValue_get_empty() {
-    return FactorValue_create_18335379();
+    return FactorValue_create_29259B2C();
 }
 
 export function FactorValue__get_ValueText(this$) {
@@ -84,19 +99,19 @@ export function FactorValue__get_NameText(this$) {
     return defaultArg(map((factor) => factor.NameText, this$.Category), "");
 }
 
-export function FactorValue__MapCategory_Z69DD836A(this$, f) {
+export function FactorValue__MapCategory_658CFBF6(this$, f) {
     return new FactorValue(this$.ID, map((p) => p.MapCategory(f), this$.Category), this$.Value, this$.Unit);
 }
 
-export function FactorValue__SetCategory_Z4C0FE73C(this$, c) {
+export function FactorValue__SetCategory_ZDED3A0F(this$, c) {
     let matchValue, p;
-    return new FactorValue(this$.ID, (matchValue = this$.Category, (matchValue == null) ? Factor.create(void 0, void 0, c) : ((p = matchValue, p.SetCategory(c)))), this$.Value, this$.Unit);
+    return new FactorValue(this$.ID, (matchValue = this$.Category, (matchValue == null) ? Factor.create(void 0, c) : ((p = matchValue, p.SetCategory(c)))), this$.Value, this$.Unit);
 }
 
 /**
  * Returns the name of the factor value as string
  */
-export function FactorValue_getNameAsString_Z2623397E(fv) {
+export function FactorValue_getNameAsString_7105C732(fv) {
     return FactorValue__get_NameText(fv);
 }
 
@@ -107,3 +122,7 @@ export function FactorValue_nameEqualsString(name, fv) {
     return FactorValue__get_NameText(fv) === name;
 }
 
+export function FactorValue_createAsPV(category, value, unit) {
+    return FactorValue_create_29259B2C(void 0, unwrap(map((c) => Factor.create(void 0, c), category)), unwrap(value), unwrap(unit));
+}
+

package/{ISA/ISA/JsonTypes → Core/Process}/Material.js

@@ -1,9 +1,9 @@
-import { Record, toString } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
-import { choose, empty, length } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
-import { defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
-import { printf, toText } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
+import { Record, toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
+import { choose, empty, length } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { MaterialType_$reflection, MaterialType__get_AsString } from "./MaterialType.js";
-import { record_type, list_type, option_type, string_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
+import { record_type, list_type, option_type, string_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { MaterialAttributeValue_$reflection } from "./MaterialAttributeValue.js";
 
 export class Material extends Record {
@@ -37,26 +37,26 @@ export class Material extends Record {
 }
 
 export function Material_$reflection() {
-    return record_type("ARCtrl.ISA.Material", [], Material, () => [["ID", option_type(string_type)], ["Name", option_type(string_type)], ["MaterialType", option_type(MaterialType_$reflection())], ["Characteristics", option_type(list_type(MaterialAttributeValue_$reflection()))], ["DerivesFrom", option_type(list_type(Material_$reflection()))]]);
+    return record_type("ARCtrl.Process.Material", [], Material, () => [["ID", option_type(string_type)], ["Name", option_type(string_type)], ["MaterialType", option_type(MaterialType_$reflection())], ["Characteristics", option_type(list_type(MaterialAttributeValue_$reflection()))], ["DerivesFrom", option_type(list_type(Material_$reflection()))]]);
 }
 
 export function Material_make(id, name, materialType, characteristics, derivesFrom) {
     return new Material(id, name, materialType, characteristics, derivesFrom);
 }
 
-export function Material_create_Z31BE6CDD(Id, Name, MaterialType, Characteristics, DerivesFrom) {
+export function Material_create_Z66909A6D(Id, Name, MaterialType, Characteristics, DerivesFrom) {
     return Material_make(Id, Name, MaterialType, Characteristics, DerivesFrom);
 }
 
 export function Material_get_empty() {
-    return Material_create_Z31BE6CDD();
+    return Material_create_Z66909A6D();
 }
 
 export function Material__get_NameText(this$) {
     return defaultArg(this$.Name, "");
 }
 
-export function Material_getUnits_Z42815C11(m) {
+export function Material_getUnits_ZBCDEB61(m) {
     return choose((c) => c.Unit, defaultArg(m.Characteristics, empty()));
 }
 

package/{ISA/ISA/JsonTypes → Core/Process}/MaterialAttribute.js

@@ -1,8 +1,8 @@
-import { Record, toString } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
-import { record_type, option_type, string_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
-import { OntologyAnnotation, OntologyAnnotation_$reflection } from "./OntologyAnnotation.js";
-import { bind, map, defaultArg, unwrap } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
-import { Option_fromValueWithDefault } from "../Helper.js";
+import { Record, toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
+import { record_type, option_type, string_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { OntologyAnnotation, OntologyAnnotation_$reflection } from "../OntologyAnnotation.js";
+import { bind, map, defaultArg, unwrap } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { Option_fromValueWithDefault } from "../Helper/Collections.js";
 
 export class MaterialAttribute extends Record {
     constructor(ID, CharacteristicType) {
@@ -21,39 +21,39 @@ export class MaterialAttribute extends Record {
 }
 
 export function MaterialAttribute_$reflection() {
-    return record_type("ARCtrl.ISA.MaterialAttribute", [], MaterialAttribute, () => [["ID", option_type(string_type)], ["CharacteristicType", option_type(OntologyAnnotation_$reflection())]]);
+    return record_type("ARCtrl.Process.MaterialAttribute", [], MaterialAttribute, () => [["ID", option_type(string_type)], ["CharacteristicType", option_type(OntologyAnnotation_$reflection())]]);
 }
 
 export function MaterialAttribute_make(id, characteristicType) {
     return new MaterialAttribute(id, characteristicType);
 }
 
-export function MaterialAttribute_create_Z6C54B221(Id, CharacteristicType) {
+export function MaterialAttribute_create_A220A8A(Id, CharacteristicType) {
     return MaterialAttribute_make(Id, CharacteristicType);
 }
 
 export function MaterialAttribute_get_empty() {
-    return MaterialAttribute_create_Z6C54B221();
+    return MaterialAttribute_create_A220A8A();
 }
 
 /**
  * Create a ISAJson MaterialAttribute from ISATab string entries
  */
-export function MaterialAttribute_fromString_Z2304A83C(term, source, accession, comments) {
-    const oa = OntologyAnnotation.fromString(term, source, accession, unwrap(comments));
-    return MaterialAttribute_make(void 0, Option_fromValueWithDefault(OntologyAnnotation.empty, oa));
+export function MaterialAttribute_fromString_5980DC03(term, source, accession, comments) {
+    const oa = OntologyAnnotation.create(term, source, accession, unwrap(comments));
+    return MaterialAttribute_make(void 0, Option_fromValueWithDefault(new OntologyAnnotation(), oa));
 }
 
 /**
  * Get ISATab string entries from an ISAJson MaterialAttribute object
  */
-export function MaterialAttribute_toString_Z5F39696D(ma) {
+export function MaterialAttribute_toStringObject_Z1E3B85DD(ma) {
     const value = {
         TermAccessionNumber: "",
         TermName: "",
         TermSourceREF: "",
     };
-    return defaultArg(map((oa) => OntologyAnnotation.toString(oa), ma.CharacteristicType), value);
+    return defaultArg(map((oa) => OntologyAnnotation.toStringObject(oa), ma.CharacteristicType), value);
 }
 
 /**
@@ -70,25 +70,25 @@ export function MaterialAttribute__get_TryNameText(this$) {
     return bind((oa) => oa.Name, this$.CharacteristicType);
 }
 
-export function MaterialAttribute__MapCategory_Z69DD836A(this$, f) {
+export function MaterialAttribute__MapCategory_658CFBF6(this$, f) {
     return new MaterialAttribute(this$.ID, map(f, this$.CharacteristicType));
 }
 
-export function MaterialAttribute__SetCategory_Z4C0FE73C(this$, c) {
+export function MaterialAttribute__SetCategory_ZDED3A0F(this$, c) {
     return new MaterialAttribute(this$.ID, c);
 }
 
 /**
  * Returns the name of the characteristic as string if it exists
  */
-export function MaterialAttribute_tryGetNameText_Z5F39696D(ma) {
+export function MaterialAttribute_tryGetNameText_Z1E3B85DD(ma) {
     return MaterialAttribute__get_NameText(ma);
 }
 
 /**
  * Returns the name of the characteristic as string
  */
-export function MaterialAttribute_getNameText_Z5F39696D(ma) {
+export function MaterialAttribute_getNameText_Z1E3B85DD(ma) {
     return MaterialAttribute__get_TryNameText(ma);
 }