@nfdi4plants/arctrl 1.0.0-beta.8 → 1.0.0

package/ISA/ISA/ArcTypes/ArcTypes.js

@@ -1,12 +1,12 @@
 import { map as map_1, defaultArg, unwrap } from "../../../fable_modules/fable-library.4.5.0/Option.js";
 import { concat, collect, append as append_4, tryFind, removeAt, tryFindIndex, exists, choose, item, map as map_2, delay, toList, fold, length, forAll, contains, filter, toArray } from "../../../fable_modules/fable-library.4.5.0/Seq.js";
 import { defaultOf, safeHash, equals, disposeSafe, getEnumerator, stringHash } from "../../../fable_modules/fable-library.4.5.0/Util.js";
-import { addRangeInPlace, tryFind as tryFind_1, removeInPlace, equalsWith, append as append_3, contains as contains_1, map } from "../../../fable_modules/fable-library.4.5.0/Array.js";
+import { addRangeInPlace, removeInPlace, equalsWith, append as append_3, contains as contains_1, map } from "../../../fable_modules/fable-library.4.5.0/Array.js";
 import { distinctBy, Array_distinct } from "../../../fable_modules/fable-library.4.5.0/Seq2.js";
 import { printf, toText } from "../../../fable_modules/fable-library.4.5.0/String.js";
-import { create, match } from "../../../fable_modules/fable-library.4.5.0/RegExp.js";
+import { ActivePatterns_$007CRegex$007C_$007C } from "../Regex.js";
 import { OntologyAnnotation } from "../JsonTypes/OntologyAnnotation.js";
-import { Value_fromString_Z721C83C5, Value__get_Text } from "../JsonTypes/Value.js";
+import { Value } from "../JsonTypes/Value.js";
 import { AnnotationValue } from "../JsonTypes/AnnotationValue.js";
 import { ArcTablesAux_applyIOMap, ArcTablesAux_getIOMap, ArcTables_$reflection, ArcTables } from "./ArcTables.js";
 import { AssayMaterials_get_empty, AssayMaterials_create_Z253F0553 } from "../JsonTypes/AssayMaterials.js";
@@ -27,21 +27,21 @@ export class ArcAssay extends ArcTables {
         super(defaultArg(tables, []));
         const performers_1 = defaultArg(performers, []);
         const comments_1 = defaultArg(comments, []);
-        this["identifier@87"] = identifier;
+        this["identifier@96"] = identifier;
         this.investigation = void 0;
-        this["MeasurementType@"] = measurementType;
-        this["TechnologyType@"] = technologyType;
-        this["TechnologyPlatform@"] = technologyPlatform;
-        this["Performers@"] = performers_1;
-        this["Comments@"] = comments_1;
+        this["measurementType@98"] = measurementType;
+        this["technologyType@99"] = technologyType;
+        this["technologyPlatform@100"] = technologyPlatform;
+        this["performers@101-1"] = performers_1;
+        this["comments@102-1"] = comments_1;
     }
     get Identifier() {
         const this$ = this;
-        return this$["identifier@87"];
+        return this$["identifier@96"];
     }
     set Identifier(i) {
         const this$ = this;
-        this$["identifier@87"] = i;
+        this$["identifier@96"] = i;
     }
     get Investigation() {
         const this$ = this;
@@ -51,48 +51,45 @@ export class ArcAssay extends ArcTables {
         const this$ = this;
         this$.investigation = i;
     }
-    static get FileName() {
-        return "isa.assay.xlsx";
-    }
     get MeasurementType() {
-        const __ = this;
-        return unwrap(__["MeasurementType@"]);
+        const this$ = this;
+        return unwrap(this$["measurementType@98"]);
     }
-    set MeasurementType(v) {
-        const __ = this;
-        __["MeasurementType@"] = v;
+    set MeasurementType(n) {
+        const this$ = this;
+        this$["measurementType@98"] = n;
     }
     get TechnologyType() {
-        const __ = this;
-        return unwrap(__["TechnologyType@"]);
+        const this$ = this;
+        return unwrap(this$["technologyType@99"]);
     }
-    set TechnologyType(v) {
-        const __ = this;
-        __["TechnologyType@"] = v;
+    set TechnologyType(n) {
+        const this$ = this;
+        this$["technologyType@99"] = n;
     }
     get TechnologyPlatform() {
-        const __ = this;
-        return unwrap(__["TechnologyPlatform@"]);
+        const this$ = this;
+        return unwrap(this$["technologyPlatform@100"]);
     }
-    set TechnologyPlatform(v) {
-        const __ = this;
-        __["TechnologyPlatform@"] = v;
+    set TechnologyPlatform(n) {
+        const this$ = this;
+        this$["technologyPlatform@100"] = n;
     }
     get Performers() {
-        const __ = this;
-        return __["Performers@"];
+        const this$ = this;
+        return this$["performers@101-1"];
     }
-    set Performers(v) {
-        const __ = this;
-        __["Performers@"] = v;
+    set Performers(n) {
+        const this$ = this;
+        this$["performers@101-1"] = n;
     }
     get Comments() {
-        const __ = this;
-        return __["Comments@"];
+        const this$ = this;
+        return this$["comments@102-1"];
     }
-    set Comments(v) {
-        const __ = this;
-        __["Comments@"] = v;
+    set Comments(n) {
+        const this$ = this;
+        this$["comments@102-1"] = n;
     }
     static init(identifier) {
         return new ArcAssay(identifier);
@@ -103,6 +100,9 @@ export class ArcAssay extends ArcTables {
     static make(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments) {
         return new ArcAssay(identifier, unwrap(measurementType), unwrap(technologyType), unwrap(technologyPlatform), tables, performers, comments);
     }
+    static get FileName() {
+        return "isa.assay.xlsx";
+    }
     get StudiesRegisteredIn() {
         const this$ = this;
         const matchValue = this$.Investigation;
@@ -441,12 +441,16 @@ export class ArcAssay extends ArcTables {
         return (matchValue == null) ? (`${tp.NameText}`) : (`${tp.NameText} (${tp.TermAccessionShort})`);
     }
     static decomposeTechnologyPlatform(name) {
-        const r = match(create("(?<value>[^\\(]+) \\((?<ontology>[^(]*:[^)]*)\\)"), name);
-        if (r != null) {
+        const activePatternResult = ActivePatterns_$007CRegex$007C_$007C("(?<value>[^\\(]+) \\((?<ontology>[^(]*:[^)]*)\\)", name);
+        if (activePatternResult != null) {
+            const r = activePatternResult;
             let oa;
             const termAnnotation = (r.groups && r.groups.ontology) || "";
             oa = OntologyAnnotation.fromTermAnnotation(termAnnotation);
-            return new OntologyAnnotation(oa.ID, new AnnotationValue(0, [Value__get_Text(Value_fromString_Z721C83C5((r.groups && r.groups.value) || ""))]), oa.TermSourceREF, oa.TermAccessionNumber, oa.Comments);
+            let v;
+            const value = (r.groups && r.groups.value) || "";
+            v = Value.fromString(value);
+            return new OntologyAnnotation(oa.ID, new AnnotationValue(0, [v.Text]), oa.TermSourceREF, oa.TermAccessionNumber, oa.Comments);
         }
         else {
             return OntologyAnnotation.fromString(name);
@@ -558,26 +562,26 @@ export class ArcStudy extends ArcTables {
         const registeredAssayIdentifiers_1 = defaultArg(registeredAssayIdentifiers, []);
         const factors_1 = defaultArg(factors, []);
         const comments_1 = defaultArg(comments, []);
-        this["identifier@564"] = identifier;
+        this["identifier@570"] = identifier;
         this.investigation = void 0;
-        this["Title@"] = title;
-        this["Description@"] = description;
-        this["SubmissionDate@"] = submissionDate;
-        this["PublicReleaseDate@"] = publicReleaseDate;
-        this["Publications@"] = publications_1;
-        this["Contacts@"] = contacts_1;
-        this["StudyDesignDescriptors@"] = studyDesignDescriptors_1;
-        this["RegisteredAssayIdentifiers@"] = registeredAssayIdentifiers_1;
-        this["Factors@"] = factors_1;
-        this["Comments@"] = comments_1;
+        this["title@572"] = title;
+        this["description@573"] = description;
+        this["submissionDate@574"] = submissionDate;
+        this["publicReleaseDate@575"] = publicReleaseDate;
+        this["publications@576-1"] = publications_1;
+        this["contacts@577-1"] = contacts_1;
+        this["studyDesignDescriptors@578-1"] = studyDesignDescriptors_1;
+        this["registeredAssayIdentifiers@579-1"] = registeredAssayIdentifiers_1;
+        this["factors@580-1"] = factors_1;
+        this["comments@581-1"] = comments_1;
     }
     get Identifier() {
         const this$ = this;
-        return this$["identifier@564"];
+        return this$["identifier@570"];
     }
     set Identifier(i) {
         const this$ = this;
-        this$["identifier@564"] = i;
+        this$["identifier@570"] = i;
     }
     get Investigation() {
         const this$ = this;
@@ -588,84 +592,84 @@ export class ArcStudy extends ArcTables {
         this$.investigation = i;
     }
     get Title() {
-        const __ = this;
-        return unwrap(__["Title@"]);
+        const this$ = this;
+        return unwrap(this$["title@572"]);
     }
-    set Title(v) {
-        const __ = this;
-        __["Title@"] = v;
+    set Title(n) {
+        const this$ = this;
+        this$["title@572"] = n;
     }
     get Description() {
-        const __ = this;
-        return unwrap(__["Description@"]);
+        const this$ = this;
+        return unwrap(this$["description@573"]);
     }
-    set Description(v) {
-        const __ = this;
-        __["Description@"] = v;
+    set Description(n) {
+        const this$ = this;
+        this$["description@573"] = n;
     }
     get SubmissionDate() {
-        const __ = this;
-        return unwrap(__["SubmissionDate@"]);
+        const this$ = this;
+        return unwrap(this$["submissionDate@574"]);
     }
-    set SubmissionDate(v) {
-        const __ = this;
-        __["SubmissionDate@"] = v;
+    set SubmissionDate(n) {
+        const this$ = this;
+        this$["submissionDate@574"] = n;
     }
     get PublicReleaseDate() {
-        const __ = this;
-        return unwrap(__["PublicReleaseDate@"]);
+        const this$ = this;
+        return unwrap(this$["publicReleaseDate@575"]);
     }
-    set PublicReleaseDate(v) {
-        const __ = this;
-        __["PublicReleaseDate@"] = v;
+    set PublicReleaseDate(n) {
+        const this$ = this;
+        this$["publicReleaseDate@575"] = n;
     }
     get Publications() {
-        const __ = this;
-        return __["Publications@"];
+        const this$ = this;
+        return this$["publications@576-1"];
     }
-    set Publications(v) {
-        const __ = this;
-        __["Publications@"] = v;
+    set Publications(n) {
+        const this$ = this;
+        this$["publications@576-1"] = n;
     }
     get Contacts() {
-        const __ = this;
-        return __["Contacts@"];
+        const this$ = this;
+        return this$["contacts@577-1"];
     }
-    set Contacts(v) {
-        const __ = this;
-        __["Contacts@"] = v;
+    set Contacts(n) {
+        const this$ = this;
+        this$["contacts@577-1"] = n;
     }
     get StudyDesignDescriptors() {
-        const __ = this;
-        return __["StudyDesignDescriptors@"];
+        const this$ = this;
+        return this$["studyDesignDescriptors@578-1"];
     }
-    set StudyDesignDescriptors(v) {
-        const __ = this;
-        __["StudyDesignDescriptors@"] = v;
+    set StudyDesignDescriptors(n) {
+        const this$ = this;
+        this$["studyDesignDescriptors@578-1"] = n;
     }
     get RegisteredAssayIdentifiers() {
-        const __ = this;
-        return __["RegisteredAssayIdentifiers@"];
+        const this$ = this;
+        return this$["registeredAssayIdentifiers@579-1"];
     }
-    set RegisteredAssayIdentifiers(v) {
-        const __ = this;
-        __["RegisteredAssayIdentifiers@"] = v;
+    set RegisteredAssayIdentifiers(n) {
+        const this$ = this;
+        this$["registeredAssayIdentifiers@579-1"] = n;
     }
     get Factors() {
-        const __ = this;
-        return __["Factors@"];
+        const this$ = this;
+        return this$["factors@580-1"];
     }
-    set Factors(v) {
-        const __ = this;
-        __["Factors@"] = v;
+    set Factors(n) {
+        const this$ = this;
+        this$["factors@580-1"] = n;
     }
     get Comments() {
-        const __ = this;
-        return __["Comments@"];
+        const this$ = this;
+        return this$["comments@581-1"];
     }
-    set Comments(v) {
-        const __ = this;
-        __["Comments@"] = v;
+    set Comments(n) {
+        const this$ = this;
+        this$["comments@581-1"] = n;
     }
     static init(identifier) {
         return new ArcStudy(identifier);
@@ -1266,124 +1270,124 @@ export class ArcInvestigation {
         const registeredStudyIdentifiers_1 = defaultArg(registeredStudyIdentifiers, []);
         const comments_1 = defaultArg(comments, []);
         const remarks_1 = defaultArg(remarks, []);
-        this["identifier@1162"] = identifier;
-        this["Title@"] = title;
-        this["Description@"] = description;
-        this["SubmissionDate@"] = submissionDate;
-        this["PublicReleaseDate@"] = publicReleaseDate;
-        this["OntologySourceReferences@"] = ontologySourceReferences_1;
-        this["Publications@"] = publications_1;
-        this["Contacts@"] = contacts_1;
-        this["Assays@"] = assays_1;
-        this["Studies@"] = studies_1;
-        this["RegisteredStudyIdentifiers@"] = registeredStudyIdentifiers_1;
-        this["Comments@"] = comments_1;
-        this["Remarks@"] = remarks_1;
-        this["init@1143"] = 1;
+        this["identifier@1173"] = identifier;
+        this["title@1174"] = title;
+        this["description@1175"] = description;
+        this["submissionDate@1176"] = submissionDate;
+        this["publicReleaseDate@1177"] = publicReleaseDate;
+        this["ontologySourceReferences@1178-1"] = ontologySourceReferences_1;
+        this["publications@1179-1"] = publications_1;
+        this["contacts@1180-1"] = contacts_1;
+        this["assays@1181-1"] = assays_1;
+        this["studies@1182-1"] = studies_1;
+        this["registeredStudyIdentifiers@1183-1"] = registeredStudyIdentifiers_1;
+        this["comments@1184-1"] = comments_1;
+        this["remarks@1185-1"] = remarks_1;
+        this["init@1154"] = 1;
     }
     get Identifier() {
         const this$ = this;
-        return this$["identifier@1162"];
+        return this$["identifier@1173"];
     }
     set Identifier(i) {
         const this$ = this;
-        this$["identifier@1162"] = i;
+        this$["identifier@1173"] = i;
     }
     get Title() {
-        const __ = this;
-        return unwrap(__["Title@"]);
+        const this$ = this;
+        return unwrap(this$["title@1174"]);
     }
-    set Title(v) {
-        const __ = this;
-        __["Title@"] = v;
+    set Title(n) {
+        const this$ = this;
+        this$["title@1174"] = n;
     }
     get Description() {
-        const __ = this;
-        return unwrap(__["Description@"]);
+        const this$ = this;
+        return unwrap(this$["description@1175"]);
     }
-    set Description(v) {
-        const __ = this;
-        __["Description@"] = v;
+    set Description(n) {
+        const this$ = this;
+        this$["description@1175"] = n;
     }
     get SubmissionDate() {
-        const __ = this;
-        return unwrap(__["SubmissionDate@"]);
+        const this$ = this;
+        return unwrap(this$["submissionDate@1176"]);
     }
-    set SubmissionDate(v) {
-        const __ = this;
-        __["SubmissionDate@"] = v;
+    set SubmissionDate(n) {
+        const this$ = this;
+        this$["submissionDate@1176"] = n;
     }
     get PublicReleaseDate() {
-        const __ = this;
-        return unwrap(__["PublicReleaseDate@"]);
+        const this$ = this;
+        return unwrap(this$["publicReleaseDate@1177"]);
     }
-    set PublicReleaseDate(v) {
-        const __ = this;
-        __["PublicReleaseDate@"] = v;
+    set PublicReleaseDate(n) {
+        const this$ = this;
+        this$["publicReleaseDate@1177"] = n;
     }
     get OntologySourceReferences() {
-        const __ = this;
-        return __["OntologySourceReferences@"];
+        const this$ = this;
+        return this$["ontologySourceReferences@1178-1"];
     }
-    set OntologySourceReferences(v) {
-        const __ = this;
-        __["OntologySourceReferences@"] = v;
+    set OntologySourceReferences(n) {
+        const this$ = this;
+        this$["ontologySourceReferences@1178-1"] = n;
     }
     get Publications() {
-        const __ = this;
-        return __["Publications@"];
+        const this$ = this;
+        return this$["publications@1179-1"];
     }
-    set Publications(v) {
-        const __ = this;
-        __["Publications@"] = v;
+    set Publications(n) {
+        const this$ = this;
+        this$["publications@1179-1"] = n;
     }
     get Contacts() {
-        const __ = this;
-        return __["Contacts@"];
+        const this$ = this;
+        return this$["contacts@1180-1"];
     }
-    set Contacts(v) {
-        const __ = this;
-        __["Contacts@"] = v;
+    set Contacts(n) {
+        const this$ = this;
+        this$["contacts@1180-1"] = n;
     }
     get Assays() {
-        const __ = this;
-        return __["Assays@"];
+        const this$ = this;
+        return this$["assays@1181-1"];
     }
-    set Assays(v) {
-        const __ = this;
-        __["Assays@"] = v;
+    set Assays(n) {
+        const this$ = this;
+        this$["assays@1181-1"] = n;
     }
     get Studies() {
-        const __ = this;
-        return __["Studies@"];
+        const this$ = this;
+        return this$["studies@1182-1"];
     }
-    set Studies(v) {
-        const __ = this;
-        __["Studies@"] = v;
+    set Studies(n) {
+        const this$ = this;
+        this$["studies@1182-1"] = n;
     }
     get RegisteredStudyIdentifiers() {
-        const __ = this;
-        return __["RegisteredStudyIdentifiers@"];
+        const this$ = this;
+        return this$["registeredStudyIdentifiers@1183-1"];
     }
-    set RegisteredStudyIdentifiers(v) {
-        const __ = this;
-        __["RegisteredStudyIdentifiers@"] = v;
+    set RegisteredStudyIdentifiers(n) {
+        const this$ = this;
+        this$["registeredStudyIdentifiers@1183-1"] = n;
     }
     get Comments() {
-        const __ = this;
-        return __["Comments@"];
+        const this$ = this;
+        return this$["comments@1184-1"];
     }
-    set Comments(v) {
-        const __ = this;
-        __["Comments@"] = v;
+    set Comments(n) {
+        const this$ = this;
+        this$["comments@1184-1"] = n;
     }
     get Remarks() {
-        const __ = this;
-        return __["Remarks@"];
+        const this$ = this;
+        return this$["remarks@1185-1"];
     }
-    set Remarks(v) {
-        const __ = this;
-        __["Remarks@"] = v;
+    set Remarks(n) {
+        const this$ = this;
+        this$["remarks@1185-1"] = n;
     }
     static get FileName() {
         return "isa.investigation.xlsx";
@@ -1552,8 +1556,13 @@ export class ArcInvestigation {
     }
     GetAssay(assayIdentifier) {
         const this$ = this;
-        const index = this$.GetAssayIndex(assayIdentifier) | 0;
-        return this$.GetAssayAt(index);
+        const matchValue = this$.TryGetAssay(assayIdentifier);
+        if (matchValue == null) {
+            throw new Error(ArcTypesAux_ErrorMsgs_unableToFindAssayIdentifier(assayIdentifier, this$.Identifier));
+        }
+        else {
+            return matchValue;
+        }
     }
     static getAssay(assayIdentifier) {
         return (inv) => {
@@ -1780,7 +1789,13 @@ export class ArcInvestigation {
     }
     GetStudy(studyIdentifier) {
         const this$ = this;
-        return defaultArg(tryFind_1((s) => (s.Identifier === studyIdentifier), this$.Studies), defaultOf());
+        const matchValue = this$.TryGetStudy(studyIdentifier);
+        if (matchValue == null) {
+            throw new Error(ArcTypesAux_ErrorMsgs_unableToFindStudyIdentifier(studyIdentifier, this$.Identifier));
+        }
+        else {
+            return matchValue;
+        }
     }
     static getStudy(studyIdentifier) {
         return (inv) => {
@@ -1936,7 +1951,8 @@ export class ArcInvestigation {
         try {
             while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
                 const study = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
-                let enumerator_1 = getEnumerator(Array.from(study.RegisteredAssayIdentifiers));
+                const rai = study.RegisteredAssayIdentifiers;
+                let enumerator_1 = getEnumerator(Array.from(rai));
                 try {
                     while (enumerator_1["System.Collections.IEnumerator.MoveNext"]()) {
                         const registeredAssay = enumerator_1["System.Collections.Generic.IEnumerator`1.get_Current"]();
@@ -2130,3 +2146,11 @@ export function ArcInvestigation_$ctor_21AB11E9(identifier, title, description,
     return new ArcInvestigation(identifier, title, description, submissionDate, publicReleaseDate, ontologySourceReferences, publications, contacts, assays, studies, registeredStudyIdentifiers, comments, remarks);
 }
 
+export function ArcTypesAux_ErrorMsgs_unableToFindAssayIdentifier(assayIdentifier, investigationIdentifier) {
+    return `Error. Unable to find assay with identifier '${assayIdentifier}' in investigation ${investigationIdentifier}.`;
+}
+
+export function ArcTypesAux_ErrorMsgs_unableToFindStudyIdentifier(studyIdentifer, investigationIdentifier) {
+    return `Error. Unable to find study with identifier '${studyIdentifer}' in investigation ${investigationIdentifier}.`;
+}
+

package/ISA/ISA/ArcTypes/CompositeHeader.js

@@ -5,7 +5,7 @@ import { ActivePatterns_$007CTermColumn$007C_$007C, Pattern_OutputPattern, Patte
 import { equals } from "../../../fable_modules/fable-library.4.5.0/Util.js";
 import { printf, toFail } from "../../../fable_modules/fable-library.4.5.0/String.js";
 import { OntologyAnnotation_$reflection, OntologyAnnotation } from "../JsonTypes/OntologyAnnotation.js";
-import { ProtocolParameter_create_Z6C54B221 } from "../JsonTypes/ProtocolParameter.js";
+import { ProtocolParameter } from "../JsonTypes/ProtocolParameter.js";
 import { Factor } from "../JsonTypes/Factor.js";
 import { MaterialAttribute_create_Z6C54B221 } from "../JsonTypes/MaterialAttribute.js";
 import { Component_create_61502994 } from "../JsonTypes/Component.js";
@@ -547,7 +547,7 @@ export class CompositeHeader extends Union {
     }
     TryParameter() {
         const this$ = this;
-        return (this$.tag === 3) ? ProtocolParameter_create_Z6C54B221(void 0, this$.fields[0]) : void 0;
+        return (this$.tag === 3) ? ProtocolParameter.create(void 0, this$.fields[0]) : void 0;
     }
     TryFactor() {
         const this$ = this;

package/ISA/ISA/ArcTypes/CompositeRow.js

@@ -1,8 +1,8 @@
 import { fold } from "../../../fable_modules/fable-library.4.5.0/Seq.js";
 import { Protocol_create_Z7DFD6E67, Protocol_addComponent, Protocol_addParameter, Protocol_setName, Protocol_setDescription, Protocol_setUri, Protocol_setVersion, Protocol_setProtocolType } from "../JsonTypes/Protocol.js";
-import { ProtocolParameter_create_Z6C54B221 } from "../JsonTypes/ProtocolParameter.js";
+import { ProtocolParameter } from "../JsonTypes/ProtocolParameter.js";
 import { Component_create_61502994 } from "../JsonTypes/Component.js";
-import { Value, Value_fromString_Z721C83C5 } from "../JsonTypes/Value.js";
+import { Value } from "../JsonTypes/Value.js";
 
 export function toProtocol(tableName, row) {
     return fold((p, hc) => {
@@ -98,9 +98,9 @@ export function toProtocol(tableName, row) {
             case 4:
                 return Protocol_setName(p, v_3);
             case 5:
-                return Protocol_addParameter(ProtocolParameter_create_Z6C54B221(void 0, oa_1), p);
+                return Protocol_addParameter(ProtocolParameter.create(void 0, oa_1), p);
             case 6:
-                return Protocol_addComponent(Component_create_61502994(void 0, Value_fromString_Z721C83C5(v_4), unit, oa_2), p);
+                return Protocol_addComponent(Component_create_61502994(void 0, Value.fromString(v_4), unit, oa_2), p);
             case 7:
                 return Protocol_addComponent(Component_create_61502994(void 0, new Value(0, [t]), void 0, oa_3), p);
             default: