@nfdi4plants/arctrl 1.2.0 → 2.0.0-alpha.2

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

@@ -1,11 +1,11 @@
-import { Union, 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 { Sample_create_E50ED22, Sample_getUnits_Z29207F1E, Sample_setFactorValues, Sample_get_empty, Sample_$reflection } from "./Sample.js";
-import { Data_create_Z326CF519, Data_$reflection } from "./Data.js";
-import { Material_create_Z31BE6CDD, Material_getUnits_Z42815C11, Material_$reflection } from "./Material.js";
-import { union_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
-import { unwrap, map, defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
-import { empty, choose } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
+import { Union, 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 { Sample_create_62424AD2, Sample_getUnits_53716792, Sample_setFactorValues, Sample_get_empty, Sample_$reflection } from "./Sample.js";
+import { Data_create_Z2AF98BBE, Data_$reflection } from "./Data.js";
+import { Material_create_Z66909A6D, Material_getUnits_ZBCDEB61, Material_$reflection } from "./Material.js";
+import { union_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { unwrap, map, defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { empty, choose } from "../../fable_modules/fable-library-js.4.16.0/List.js";
 import { DataFile } from "./DataFile.js";
 
 export class ProcessOutput extends Union {
@@ -41,7 +41,7 @@ export class ProcessOutput extends Union {
 }
 
 export function ProcessOutput_$reflection() {
-    return union_type("ARCtrl.ISA.ProcessOutput", [], ProcessOutput, () => [[["Item", Sample_$reflection()]], [["Item", Data_$reflection()]], [["Item", Material_$reflection()]]]);
+    return union_type("ARCtrl.Process.ProcessOutput", [], ProcessOutput, () => [[["Item", Sample_$reflection()]], [["Item", Data_$reflection()]], [["Item", Material_$reflection()]]]);
 }
 
 export function ProcessOutput__get_TryName(this$) {
@@ -66,14 +66,14 @@ export function ProcessOutput_get_Default() {
 /**
  * Returns name of processOutput
  */
-export function ProcessOutput_tryGetName_11830B70(po) {
+export function ProcessOutput_tryGetName_Z42C11600(po) {
     return ProcessOutput__get_TryName(po);
 }
 
 /**
  * Returns name of processInput
  */
-export function ProcessOutput_getName_11830B70(po) {
+export function ProcessOutput_getName_Z42C11600(po) {
     return ProcessOutput__get_Name(po);
 }
 
@@ -87,7 +87,7 @@ export function ProcessOutput_nameEquals(name, po) {
 /**
  * Returns true, if Process Output is Sample
  */
-export function ProcessOutput_isSample_11830B70(po) {
+export function ProcessOutput_isSample_Z42C11600(po) {
     if (po.tag === 0) {
         return true;
     }
@@ -99,7 +99,7 @@ export function ProcessOutput_isSample_11830B70(po) {
 /**
  * Returns true, if Process Output is Data
  */
-export function ProcessOutput_isData_11830B70(po) {
+export function ProcessOutput_isData_Z42C11600(po) {
     if (po.tag === 1) {
         return true;
     }
@@ -111,7 +111,7 @@ export function ProcessOutput_isData_11830B70(po) {
 /**
  * Returns true, if Process Output is Material
  */
-export function ProcessOutput_isMaterial_11830B70(po) {
+export function ProcessOutput_isMaterial_Z42C11600(po) {
     if (po.tag === 2) {
         return true;
     }
@@ -124,27 +124,27 @@ export function ProcessOutput_isMaterial_11830B70(po) {
  * Returns true, if Process Output is Sample
  */
 export function ProcessOutput__isSample(this$) {
-    return ProcessOutput_isSample_11830B70(this$);
+    return ProcessOutput_isSample_Z42C11600(this$);
 }
 
 /**
  * Returns true, if Process Output is Data
  */
 export function ProcessOutput__isData(this$) {
-    return ProcessOutput_isData_11830B70(this$);
+    return ProcessOutput_isData_Z42C11600(this$);
 }
 
 /**
  * Returns true, if Process Output is Material
  */
 export function ProcessOutput__isMaterial(this$) {
-    return ProcessOutput_isMaterial_11830B70(this$);
+    return ProcessOutput_isMaterial_Z42C11600(this$);
 }
 
 /**
  * If given process output is a sample, returns it, else returns None
  */
-export function ProcessOutput_trySample_11830B70(po) {
+export function ProcessOutput_trySample_Z42C11600(po) {
     if (po.tag === 0) {
         return po.fields[0];
     }
@@ -156,7 +156,7 @@ export function ProcessOutput_trySample_11830B70(po) {
 /**
  * If given process output is a data, returns it, else returns None
  */
-export function ProcessOutput_tryData_11830B70(po) {
+export function ProcessOutput_tryData_Z42C11600(po) {
     if (po.tag === 1) {
         return po.fields[0];
     }
@@ -168,7 +168,7 @@ export function ProcessOutput_tryData_11830B70(po) {
 /**
  * If given process output is a material, returns it, else returns None
  */
-export function ProcessOutput_tryMaterial_11830B70(po) {
+export function ProcessOutput_tryMaterial_Z42C11600(po) {
     if (po.tag === 2) {
         return po.fields[0];
     }
@@ -180,7 +180,7 @@ export function ProcessOutput_tryMaterial_11830B70(po) {
 /**
  * If given process output contains characteristics, returns them
  */
-export function ProcessOutput_tryGetCharacteristicValues_11830B70(po) {
+export function ProcessOutput_tryGetCharacteristicValues_Z42C11600(po) {
     switch (po.tag) {
         case 2:
             return po.fields[0].Characteristics;
@@ -194,14 +194,14 @@ export function ProcessOutput_tryGetCharacteristicValues_11830B70(po) {
 /**
  * If given process output contains characteristics, returns them
  */
-export function ProcessOutput_tryGetCharacteristics_11830B70(po) {
-    return map((list) => choose((c) => c.Category, list), ProcessOutput_tryGetCharacteristicValues_11830B70(po));
+export function ProcessOutput_tryGetCharacteristics_Z42C11600(po) {
+    return map((list) => choose((c) => c.Category, list), ProcessOutput_tryGetCharacteristicValues_Z42C11600(po));
 }
 
 /**
  * If given process output contains factors, returns them
  */
-export function ProcessOutput_tryGetFactorValues_11830B70(po) {
+export function ProcessOutput_tryGetFactorValues_Z42C11600(po) {
     switch (po.tag) {
         case 2:
             return void 0;
@@ -223,41 +223,41 @@ export function ProcessOutput_setFactorValues(values, po) {
     }
 }
 
-export function ProcessOutput_getFactorValues_11830B70(po) {
-    return defaultArg(ProcessOutput_tryGetFactorValues_11830B70(po), empty());
+export function ProcessOutput_getFactorValues_Z42C11600(po) {
+    return defaultArg(ProcessOutput_tryGetFactorValues_Z42C11600(po), empty());
 }
 
 /**
  * If given process output contains units, returns them
  */
-export function ProcessOutput_getUnits_11830B70(po) {
+export function ProcessOutput_getUnits_Z42C11600(po) {
     switch (po.tag) {
         case 2:
-            return Material_getUnits_Z42815C11(po.fields[0]);
+            return Material_getUnits_ZBCDEB61(po.fields[0]);
         case 1:
             return empty();
         default:
-            return Sample_getUnits_Z29207F1E(po.fields[0]);
+            return Sample_getUnits_53716792(po.fields[0]);
     }
 }
 
-export function ProcessOutput_createSample_Z6DF16D07(name, characteristics, factors, derivesFrom) {
-    return new ProcessOutput(0, [Sample_create_E50ED22(void 0, name, unwrap(characteristics), unwrap(factors), unwrap(derivesFrom))]);
+export function ProcessOutput_createSample_Z598187B7(name, characteristics, factors, derivesFrom) {
+    return new ProcessOutput(0, [Sample_create_62424AD2(void 0, name, unwrap(characteristics), unwrap(factors), unwrap(derivesFrom))]);
 }
 
-export function ProcessOutput_createMaterial_2363974C(name, characteristics, derivesFrom) {
-    return new ProcessOutput(2, [Material_create_Z31BE6CDD(void 0, name, void 0, unwrap(characteristics), unwrap(derivesFrom))]);
+export function ProcessOutput_createMaterial_4452CB4C(name, characteristics, derivesFrom) {
+    return new ProcessOutput(2, [Material_create_Z66909A6D(void 0, name, void 0, unwrap(characteristics), unwrap(derivesFrom))]);
 }
 
 export function ProcessOutput_createImageFile_Z721C83C5(name) {
-    return new ProcessOutput(1, [Data_create_Z326CF519(void 0, name, new DataFile(2, []))]);
+    return new ProcessOutput(1, [Data_create_Z2AF98BBE(void 0, name, new DataFile(2, []))]);
 }
 
 export function ProcessOutput_createRawData_Z721C83C5(name) {
-    return new ProcessOutput(1, [Data_create_Z326CF519(void 0, name, new DataFile(0, []))]);
+    return new ProcessOutput(1, [Data_create_Z2AF98BBE(void 0, name, new DataFile(0, []))]);
 }
 
 export function ProcessOutput_createDerivedData_Z721C83C5(name) {
-    return new ProcessOutput(1, [Data_create_Z326CF519(void 0, name, new DataFile(1, []))]);
+    return new ProcessOutput(1, [Data_create_Z2AF98BBE(void 0, name, new DataFile(1, []))]);
 }
 

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

@@ -1,11 +1,11 @@
-import { bind, unwrap, map, defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.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 { bind, unwrap, map, defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.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";
 import { ProtocolParameter_$reflection, ProtocolParameter } from "./ProtocolParameter.js";
-import { Record, toString } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
-import { record_type, option_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 { record_type, option_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { Value_$reflection } from "./Value.js";
-import { OntologyAnnotation_$reflection } from "./OntologyAnnotation.js";
+import { OntologyAnnotation_$reflection } from "../OntologyAnnotation.js";
 
 export class ProcessParameterValue extends Record {
     constructor(Category, Value, Unit) {
@@ -79,6 +79,10 @@ export class ProcessParameterValue extends Record {
     static getCategory(pv) {
         return pv.Category;
     }
+    static createAsPV(category, value, unit) {
+        const category_1 = map((c) => ProtocolParameter.create(void 0, c), category);
+        return ProcessParameterValue.create(unwrap(category_1), unwrap(value), unwrap(unit));
+    }
     Print() {
         const this$ = this;
         return toString(this$);
@@ -99,9 +103,24 @@ export class ProcessParameterValue 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((p) => p.ParameterName, this$.Category);
+    }
+    GetAdditionalType() {
+        return "ProcessParameterValue";
+    }
+    GetValue() {
+        const this$ = this;
+        return this$.Value;
+    }
+    GetUnit() {
+        const this$ = this;
+        return this$.Unit;
+    }
 }
 
 export function ProcessParameterValue_$reflection() {
-    return record_type("ARCtrl.ISA.ProcessParameterValue", [], ProcessParameterValue, () => [["Category", option_type(ProtocolParameter_$reflection())], ["Value", option_type(Value_$reflection())], ["Unit", option_type(OntologyAnnotation_$reflection())]]);
+    return record_type("ARCtrl.Process.ProcessParameterValue", [], ProcessParameterValue, () => [["Category", option_type(ProtocolParameter_$reflection())], ["Value", option_type(Value_$reflection())], ["Unit", option_type(OntologyAnnotation_$reflection())]]);
 }
 

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

@@ -1,12 +1,12 @@
-import { List_groupBy, List_distinct } from "../../../fable_modules/fable-library-js.4.13.0/Seq2.js";
-import { singleton, zip, map, empty, collect, concat, filter, choose } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
-import { value as value_4, defaultArg, bind } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
-import { arrayHash, equalArrays, comparePrimitives, safeHash, equals, stringHash } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
-import { Process_updateProtocol, Process_getMaterials_716E708F, Process_getSamples_716E708F, Process_getSources_716E708F, Process_getData_716E708F, Process_getUnits_716E708F, Process_getFactors_716E708F, Process_tryGetOutputsWithFactorBy, Process_tryGetOutputsWithCharacteristicBy, Process_tryGetInputsWithCharacteristicBy, Process_getCharacteristics_716E708F, Process_getParameters_716E708F, Process_tryGetOutputsWithParameterBy, Process_tryGetInputsWithParameterBy } from "./Process.js";
-import { FSharpSet__Contains, ofList } from "../../../fable_modules/fable-library-js.4.13.0/Set.js";
-import { ProcessOutput__get_Name, ProcessOutput_getName_11830B70 } from "./ProcessOutput.js";
-import { ProcessInput__get_Name, ProcessInput_getName_102B6859 } from "./ProcessInput.js";
-import { FSharpMap__TryFind, ofList as ofList_1 } from "../../../fable_modules/fable-library-js.4.13.0/Map.js";
+import { List_groupBy, List_distinct } from "../../fable_modules/fable-library-js.4.16.0/Seq2.js";
+import { singleton, zip, map, empty, collect, concat, filter, choose } from "../../fable_modules/fable-library-js.4.16.0/List.js";
+import { value as value_4, defaultArg, bind } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
+import { arrayHash, equalArrays, comparePrimitives, safeHash, equals, stringHash } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
+import { Process_getMaterials_763471FF, Process_getSamples_763471FF, Process_getSources_763471FF, Process_getData_763471FF, Process_getUnits_763471FF, Process_getFactors_763471FF, Process_tryGetOutputsWithFactorBy, Process_tryGetOutputsWithCharacteristicBy, Process_tryGetInputsWithCharacteristicBy, Process_getCharacteristics_763471FF, Process_getParameters_763471FF, Process_tryGetOutputsWithParameterBy, Process_tryGetInputsWithParameterBy } from "./Process.js";
+import { FSharpSet__Contains, ofList } from "../../fable_modules/fable-library-js.4.16.0/Set.js";
+import { ProcessOutput__get_Name, ProcessOutput_getName_Z42C11600 } from "./ProcessOutput.js";
+import { ProcessInput__get_Name, ProcessInput_getName_5B3D5BA9 } from "./ProcessInput.js";
+import { FSharpMap__TryFind, ofList as ofList_1 } from "../../fable_modules/fable-library-js.4.16.0/Map.js";
 
 /**
  * Returns the names of the protocols the given processes impelement
@@ -81,7 +81,7 @@ export function getOutputsWithParameterBy(predicate, processSequence) {
  * Returns the parameters implemented by the processes contained in these processes
  */
 export function getParameters(processSequence) {
-    return List_distinct(collect(Process_getParameters_716E708F, processSequence), {
+    return List_distinct(collect(Process_getParameters_763471FF, processSequence), {
         Equals: equals,
         GetHashCode: safeHash,
     });
@@ -91,7 +91,7 @@ export function getParameters(processSequence) {
  * Returns the characteristics describing the inputs and outputs of the processssequence
  */
 export function getCharacteristics(processSequence) {
-    return List_distinct(collect(Process_getCharacteristics_716E708F, processSequence), {
+    return List_distinct(collect(Process_getCharacteristics_763471FF, processSequence), {
         Equals: equals,
         GetHashCode: safeHash,
     });
@@ -122,7 +122,7 @@ export function getOutputsWithFactorBy(predicate, processSequence) {
  * Returns the factors implemented by the processes contained in these processes
  */
 export function getFactors(processSequence) {
-    return List_distinct(collect(Process_getFactors_716E708F, processSequence), {
+    return List_distinct(collect(Process_getFactors_763471FF, processSequence), {
         Equals: equals,
         GetHashCode: safeHash,
     });
@@ -133,20 +133,20 @@ export function getFactors(processSequence) {
  */
 export function getRootInputs(processSequence) {
     const inputs = collect((p) => defaultArg(p.Inputs, empty()), processSequence);
-    const outputs = ofList(collect((p_1) => map(ProcessOutput_getName_11830B70, defaultArg(p_1.Outputs, empty())), processSequence), {
+    const outputs = ofList(collect((p_1) => map(ProcessOutput_getName_Z42C11600, defaultArg(p_1.Outputs, empty())), processSequence), {
         Compare: comparePrimitives,
     });
-    return filter((i) => !FSharpSet__Contains(outputs, ProcessInput_getName_102B6859(i)), inputs);
+    return filter((i) => !FSharpSet__Contains(outputs, ProcessInput_getName_5B3D5BA9(i)), inputs);
 }
 
 /**
  * Returns the final outputs of the processSequence, which point to no further nodes
  */
 export function getFinalOutputs(processSequence) {
-    const inputs = ofList(collect((p) => map(ProcessInput_getName_102B6859, defaultArg(p.Inputs, empty())), processSequence), {
+    const inputs = ofList(collect((p) => map(ProcessInput_getName_5B3D5BA9, defaultArg(p.Inputs, empty())), processSequence), {
         Compare: comparePrimitives,
     });
-    return filter((o) => !FSharpSet__Contains(inputs, ProcessOutput_getName_11830B70(o)), collect((p_1) => defaultArg(p_1.Outputs, empty()), processSequence));
+    return filter((o) => !FSharpSet__Contains(inputs, ProcessOutput_getName_Z42C11600(o)), collect((p_1) => defaultArg(p_1.Outputs, empty()), processSequence));
 }
 
 /**
@@ -212,7 +212,7 @@ export function getFinalOutputsOf(processSequence, sample) {
 }
 
 export function getUnits(processSequence) {
-    return List_distinct(collect(Process_getUnits_716E708F, processSequence), {
+    return List_distinct(collect(Process_getUnits_763471FF, processSequence), {
         Equals: equals,
         GetHashCode: safeHash,
     });
@@ -222,34 +222,30 @@ export function getUnits(processSequence) {
  * Returns the data the given processes contain
  */
 export function getData(processSequence) {
-    return List_distinct(collect(Process_getData_716E708F, processSequence), {
+    return List_distinct(collect(Process_getData_763471FF, processSequence), {
         Equals: equals,
         GetHashCode: safeHash,
     });
 }
 
 export function getSources(processSequence) {
-    return List_distinct(collect(Process_getSources_716E708F, processSequence), {
+    return List_distinct(collect(Process_getSources_763471FF, processSequence), {
         Equals: equals,
         GetHashCode: safeHash,
     });
 }
 
 export function getSamples(processSequence) {
-    return List_distinct(collect(Process_getSamples_716E708F, processSequence), {
+    return List_distinct(collect(Process_getSamples_763471FF, processSequence), {
         Equals: equals,
         GetHashCode: safeHash,
     });
 }
 
 export function getMaterials(processSequence) {
-    return List_distinct(collect(Process_getMaterials_716E708F, processSequence), {
+    return List_distinct(collect(Process_getMaterials_763471FF, processSequence), {
         Equals: equals,
         GetHashCode: safeHash,
     });
 }
 
-export function updateProtocols(protocols, processSequence) {
-    return map((p) => Process_updateProtocol(protocols, p), processSequence);
-}
-

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

@@ -1,14 +1,12 @@
-import { Record } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
-import { getRecordFields, makeRecord, record_type, list_type, option_type, string_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
-import { OntologyAnnotation_$reflection } from "./OntologyAnnotation.js";
+import { Record } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
+import { record_type, list_type, option_type, string_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { OntologyAnnotation_$reflection } from "../OntologyAnnotation.js";
 import { ProtocolParameter_$reflection } from "./ProtocolParameter.js";
 import { Component_$reflection } from "./Component.js";
-import { Comment$_$reflection } from "./Comment.js";
-import { empty, filter, map, singleton, append, exists, tryFind } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
-import { equals } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
-import { map2 } from "../../../fable_modules/fable-library-js.4.13.0/Array.js";
-import { Update_updateOnlyByExistingAppend, Update_updateOnlyByExisting, Update_updateAppend } from "../Helper.js";
-import { defaultArg, map as map_1 } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { Comment$_$reflection } from "../Comment.js";
+import { empty, 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 { defaultArg, map } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 
 export class Protocol extends Record {
     constructor(ID, Name, ProtocolType, Description, Uri, Version, Parameters, Components, Comments) {
@@ -26,19 +24,19 @@ export class Protocol extends Record {
 }
 
 export function Protocol_$reflection() {
-    return record_type("ARCtrl.ISA.Protocol", [], Protocol, () => [["ID", option_type(string_type)], ["Name", option_type(string_type)], ["ProtocolType", option_type(OntologyAnnotation_$reflection())], ["Description", option_type(string_type)], ["Uri", option_type(string_type)], ["Version", option_type(string_type)], ["Parameters", option_type(list_type(ProtocolParameter_$reflection()))], ["Components", option_type(list_type(Component_$reflection()))], ["Comments", option_type(list_type(Comment$_$reflection()))]]);
+    return record_type("ARCtrl.Process.Protocol", [], Protocol, () => [["ID", option_type(string_type)], ["Name", option_type(string_type)], ["ProtocolType", option_type(OntologyAnnotation_$reflection())], ["Description", option_type(string_type)], ["Uri", option_type(string_type)], ["Version", option_type(string_type)], ["Parameters", option_type(list_type(ProtocolParameter_$reflection()))], ["Components", option_type(list_type(Component_$reflection()))], ["Comments", option_type(list_type(Comment$_$reflection()))]]);
 }
 
 export function Protocol_make(id, name, protocolType, description, uri, version, parameters, components, comments) {
     return new Protocol(id, name, protocolType, description, uri, version, parameters, components, comments);
 }
 
-export function Protocol_create_Z7DFD6E67(Id, Name, ProtocolType, Description, Uri, Version, Parameters, Components, Comments) {
+export function Protocol_create_Z414665E7(Id, Name, ProtocolType, Description, Uri, Version, Parameters, Components, Comments) {
     return Protocol_make(Id, Name, ProtocolType, Description, Uri, Version, Parameters, Components, Comments);
 }
 
 export function Protocol_get_empty() {
-    return Protocol_create_Z7DFD6E67();
+    return Protocol_create_Z414665E7();
 }
 
 /**
@@ -62,35 +60,6 @@ export function Protocol_add(protocols, protocol) {
     return append(protocols, singleton(protocol));
 }
 
-/**
- * Updates all protocols for which the predicate returns true with the given protocol values
- */
-export function Protocol_updateBy(predicate, updateOption, protocol, protocols) {
-    if (exists(predicate, protocols)) {
-        return map((p) => {
-            if (predicate(p)) {
-                const this$ = updateOption;
-                const recordType_1 = p;
-                const recordType_2 = protocol;
-                return (this$.tag === 2) ? makeRecord(Protocol_$reflection(), map2(Update_updateAppend, getRecordFields(recordType_1), getRecordFields(recordType_2))) : ((this$.tag === 1) ? makeRecord(Protocol_$reflection(), map2(Update_updateOnlyByExisting, getRecordFields(recordType_1), getRecordFields(recordType_2))) : ((this$.tag === 3) ? makeRecord(Protocol_$reflection(), map2(Update_updateOnlyByExistingAppend, getRecordFields(recordType_1), getRecordFields(recordType_2))) : recordType_2));
-            }
-            else {
-                return p;
-            }
-        }, protocols);
-    }
-    else {
-        return protocols;
-    }
-}
-
-/**
- * Updates all protocols with the same name as the given protocol with its values
- */
-export function Protocol_updateByName(updateOption, protocol, protocols) {
-    return Protocol_updateBy((p) => equals(p.Name, protocol.Name), updateOption, protocol, protocols);
-}
-
 /**
  * If a protocol with the given name exists in the list, removes it
  */
@@ -101,7 +70,7 @@ export function Protocol_removeByName(name, protocols) {
 /**
  * Returns comments of a protocol
  */
-export function Protocol_getComments_Z5F51792E(protocol) {
+export function Protocol_getComments_3BF20962(protocol) {
     return protocol.Comments;
 }
 
@@ -109,7 +78,7 @@ export function Protocol_getComments_Z5F51792E(protocol) {
  * Applies function f on comments of a protocol
  */
 export function Protocol_mapComments(f, protocol) {
-    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, protocol.Description, protocol.Uri, protocol.Version, protocol.Parameters, protocol.Components, map_1(f, protocol.Comments));
+    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, protocol.Description, protocol.Uri, protocol.Version, protocol.Parameters, protocol.Components, map(f, protocol.Comments));
 }
 
 /**
@@ -122,7 +91,7 @@ export function Protocol_setComments(protocol, comments) {
 /**
  * Returns protocol type of a protocol
  */
-export function Protocol_getProtocolType_Z5F51792E(protocol) {
+export function Protocol_getProtocolType_3BF20962(protocol) {
     return protocol.ProtocolType;
 }
 
@@ -130,7 +99,7 @@ export function Protocol_getProtocolType_Z5F51792E(protocol) {
  * Applies function f on protocol type of a protocol
  */
 export function Protocol_mapProtocolType(f, protocol) {
-    return new Protocol(protocol.ID, protocol.Name, map_1(f, protocol.ProtocolType), protocol.Description, protocol.Uri, protocol.Version, protocol.Parameters, protocol.Components, protocol.Comments);
+    return new Protocol(protocol.ID, protocol.Name, map(f, protocol.ProtocolType), protocol.Description, protocol.Uri, protocol.Version, protocol.Parameters, protocol.Components, protocol.Comments);
 }
 
 /**
@@ -143,7 +112,7 @@ export function Protocol_setProtocolType(protocol, protocolType) {
 /**
  * Returns protocol version of a protocol
  */
-export function Protocol_getVersion_Z5F51792E(protocol) {
+export function Protocol_getVersion_3BF20962(protocol) {
     return protocol.Version;
 }
 
@@ -151,7 +120,7 @@ export function Protocol_getVersion_Z5F51792E(protocol) {
  * Applies function f on protocol version of a protocol
  */
 export function Protocol_mapVersion(f, protocol) {
-    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, protocol.Description, protocol.Uri, map_1(f, protocol.Version), protocol.Parameters, protocol.Components, protocol.Comments);
+    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, protocol.Description, protocol.Uri, map(f, protocol.Version), protocol.Parameters, protocol.Components, protocol.Comments);
 }
 
 /**
@@ -165,7 +134,7 @@ export function Protocol_setVersion(protocol, version) {
  * Protocol Name
  * Returns protocol name of a protocol
  */
-export function Protocol_getName_Z5F51792E(protocol) {
+export function Protocol_getName_3BF20962(protocol) {
     return protocol.Name;
 }
 
@@ -173,7 +142,7 @@ export function Protocol_getName_Z5F51792E(protocol) {
  * Applies function f on protocol name of a protocol
  */
 export function Protocol_mapName(f, protocol) {
-    return new Protocol(protocol.ID, map_1(f, protocol.Name), protocol.ProtocolType, protocol.Description, protocol.Uri, protocol.Version, protocol.Parameters, protocol.Components, protocol.Comments);
+    return new Protocol(protocol.ID, map(f, protocol.Name), protocol.ProtocolType, protocol.Description, protocol.Uri, protocol.Version, protocol.Parameters, protocol.Components, protocol.Comments);
 }
 
 /**
@@ -186,7 +155,7 @@ export function Protocol_setName(protocol, name) {
 /**
  * Returns protocol description of a protocol
  */
-export function Protocol_getDescription_Z5F51792E(protocol) {
+export function Protocol_getDescription_3BF20962(protocol) {
     return protocol.Description;
 }
 
@@ -194,7 +163,7 @@ export function Protocol_getDescription_Z5F51792E(protocol) {
  * Applies function f on protocol description of a protocol
  */
 export function Protocol_mapDescription(f, protocol) {
-    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, map_1(f, protocol.Description), protocol.Uri, protocol.Version, protocol.Parameters, protocol.Components, protocol.Comments);
+    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, map(f, protocol.Description), protocol.Uri, protocol.Version, protocol.Parameters, protocol.Components, protocol.Comments);
 }
 
 /**
@@ -207,7 +176,7 @@ export function Protocol_setDescription(protocol, description) {
 /**
  * Returns protocol URI of a protocol
  */
-export function Protocol_getUri_Z5F51792E(protocol) {
+export function Protocol_getUri_3BF20962(protocol) {
     return protocol.Uri;
 }
 
@@ -215,7 +184,7 @@ export function Protocol_getUri_Z5F51792E(protocol) {
  * Applies function f on protocol URI of a protocol
  */
 export function Protocol_mapUri(f, protocol) {
-    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, protocol.Description, map_1(f, protocol.Uri), protocol.Version, protocol.Parameters, protocol.Components, protocol.Comments);
+    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, protocol.Description, map(f, protocol.Uri), protocol.Version, protocol.Parameters, protocol.Components, protocol.Comments);
 }
 
 /**
@@ -228,7 +197,7 @@ export function Protocol_setUri(protocol, uri) {
 /**
  * Returns components of a protocol
  */
-export function Protocol_getComponents_Z5F51792E(protocol) {
+export function Protocol_getComponents_3BF20962(protocol) {
     return protocol.Components;
 }
 
@@ -236,7 +205,7 @@ export function Protocol_getComponents_Z5F51792E(protocol) {
  * Applies function f on components of a protocol
  */
 export function Protocol_mapComponents(f, protocol) {
-    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, protocol.Description, protocol.Uri, protocol.Version, protocol.Parameters, map_1(f, protocol.Components), protocol.Comments);
+    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, protocol.Description, protocol.Uri, protocol.Version, protocol.Parameters, map(f, protocol.Components), protocol.Comments);
 }
 
 /**
@@ -253,7 +222,7 @@ export function Protocol_addComponent(comp, protocol) {
 /**
  * Returns protocol parameters of a protocol
  */
-export function Protocol_getParameters_Z5F51792E(protocol) {
+export function Protocol_getParameters_3BF20962(protocol) {
     return protocol.Parameters;
 }
 
@@ -261,7 +230,7 @@ export function Protocol_getParameters_Z5F51792E(protocol) {
  * Applies function f on protocol parameters of a protocol
  */
 export function Protocol_mapParameters(f, protocol) {
-    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, protocol.Description, protocol.Uri, protocol.Version, map_1(f, protocol.Parameters), protocol.Components, protocol.Comments);
+    return new Protocol(protocol.ID, protocol.Name, protocol.ProtocolType, protocol.Description, protocol.Uri, protocol.Version, map(f, protocol.Parameters), protocol.Components, protocol.Comments);
 }
 
 /**

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

@@ -1,8 +1,8 @@
-import { OntologyAnnotation_$reflection, OntologyAnnotation } 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.13.0/Types.js";
-import { record_type, option_type, string_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
+import { OntologyAnnotation_$reflection, OntologyAnnotation } 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";
+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";
 
 export class ProtocolParameter extends Record {
     constructor(ID, ParameterName) {
@@ -20,17 +20,17 @@ export class ProtocolParameter extends Record {
         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);
+        const oa = OntologyAnnotation.create(term, source, accession, unwrap(comments));
+        const parameterName = Option_fromValueWithDefault(new OntologyAnnotation(), oa);
         return ProtocolParameter.make(void 0, parameterName);
     }
-    static toString(pp) {
+    static toStringObject(pp) {
         const value = {
             TermAccessionNumber: "",
             TermName: "",
             TermSourceREF: "",
         };
-        return defaultArg(map((oa) => OntologyAnnotation.toString(oa), pp.ParameterName), value);
+        return defaultArg(map((oa) => OntologyAnnotation.toStringObject(oa), pp.ParameterName), value);
     }
     get NameText() {
         const this$ = this;
@@ -68,6 +68,6 @@ export class ProtocolParameter extends Record {
 }
 
 export function ProtocolParameter_$reflection() {
-    return record_type("ARCtrl.ISA.ProtocolParameter", [], ProtocolParameter, () => [["ID", option_type(string_type)], ["ParameterName", option_type(OntologyAnnotation_$reflection())]]);
+    return record_type("ARCtrl.Process.ProtocolParameter", [], ProtocolParameter, () => [["ID", option_type(string_type)], ["ParameterName", option_type(OntologyAnnotation_$reflection())]]);
 }