@nfdi4plants/arctrl 1.0.0-alpha7 → 1.0.0-alpha9

package/ISA/ISA/ArcTypes/CompositeHeader.js

@@ -2,6 +2,7 @@ import { map } from "../../../fable_modules/fable-library.4.1.4/Array.js";
 import { union_type, string_type, getUnionCases, name } from "../../../fable_modules/fable-library.4.1.4/Reflection.js";
 import { Union, toString } from "../../../fable_modules/fable-library.4.1.4/Types.js";
 import { ActivePatterns_$007CTermColumn$007C_$007C, Pattern_OutputPattern, Pattern_InputPattern, ActivePatterns_$007CRegex$007C_$007C, tryParseIOTypeHeader } from "../Regex.js";
+import { equals } from "../../../fable_modules/fable-library.4.1.4/Util.js";
 import { printf, toFail } from "../../../fable_modules/fable-library.4.1.4/String.js";
 import { OntologyAnnotation_$reflection, OntologyAnnotation } from "../JsonTypes/OntologyAnnotation.js";
 import { ProtocolParameter_create_Z6C54B221 } from "../JsonTypes/ProtocolParameter.js";
@@ -40,6 +41,82 @@ export class IOType extends Union {
         };
         return (this$.tag === 6) ? stringCreate(this$.fields[0]) : stringCreate(this$);
     }
+    Merge(other) {
+        const this$ = this;
+        switch (this$.tag) {
+            case 4:
+                switch (other.tag) {
+                    case 0:
+                        return new IOType(4, []);
+                    case 2:
+                        return new IOType(4, []);
+                    case 3:
+                        return new IOType(4, []);
+                    case 4:
+                        return new IOType(4, []);
+                    default:
+                        throw new Error(`ImageFile IO column and ${other} can not be merged`);
+                }
+            case 3:
+                switch (other.tag) {
+                    case 0:
+                        return new IOType(3, []);
+                    case 2:
+                        return new IOType(3, []);
+                    case 3:
+                        return new IOType(3, []);
+                    case 4:
+                        return new IOType(4, []);
+                    default:
+                        throw new Error(`DerivedDataFile IO column and ${other} can not be merged`);
+                }
+            case 2:
+                switch (other.tag) {
+                    case 0:
+                        return new IOType(2, []);
+                    case 2:
+                        return new IOType(2, []);
+                    case 3:
+                        return new IOType(3, []);
+                    case 4:
+                        return new IOType(4, []);
+                    default:
+                        throw new Error(`RawDataFile IO column and ${other} can not be merged`);
+                }
+            case 1:
+                switch (other.tag) {
+                    case 0:
+                        return new IOType(1, []);
+                    case 1:
+                        return new IOType(1, []);
+                    default:
+                        throw new Error(`Sample IO column and ${other} can not be merged`);
+                }
+            case 0:
+                return (other.tag === 0) ? (new IOType(0, [])) : other;
+            case 5:
+                switch (other.tag) {
+                    case 0:
+                        return new IOType(5, []);
+                    case 5:
+                        return new IOType(5, []);
+                    default:
+                        throw new Error(`Material IO column and ${other} can not be merged`);
+                }
+            default:
+                if (other.tag === 6) {
+                    if (this$.fields[0] === other.fields[0]) {
+                        return new IOType(6, [this$.fields[0]]);
+                    }
+                    else {
+                        throw new Error(`FreeText IO column names ${this$.fields[0]} and ${other.fields[0]} do differ`);
+                    }
+                }
+                else {
+                    throw new Error(`FreeText IO column and ${other} can not be merged`);
+                }
+        }
+    }
     toString() {
         const this$ = this;
         return (this$.tag === 1) ? "Sample Name" : ((this$.tag === 2) ? "Raw Data File" : ((this$.tag === 3) ? "Derived Data File" : ((this$.tag === 4) ? "Image File" : ((this$.tag === 5) ? "Material" : ((this$.tag === 6) ? this$.fields[0] : "Source Name")))));
@@ -57,6 +134,87 @@ export class IOType extends Union {
             return IOType.ofString(s);
         }
     }
+    GetUITooltip() {
+        const this$ = this;
+        return IOType.getUITooltip(this$);
+    }
+    static getUITooltip(iotype) {
+        let matchResult;
+        if (typeof iotype === "string") {
+            if (equals(iotype, "Source")) {
+                matchResult = 0;
+            }
+            else if (equals(iotype, "Sample")) {
+                matchResult = 1;
+            }
+            else if (equals(iotype, "RawDataFile")) {
+                matchResult = 2;
+            }
+            else if (equals(iotype, "DerivedDataFile")) {
+                matchResult = 3;
+            }
+            else if (equals(iotype, "ImageFile")) {
+                matchResult = 4;
+            }
+            else if (equals(iotype, "Material")) {
+                matchResult = 5;
+            }
+            else if (equals(iotype, "FreeText")) {
+                matchResult = 6;
+            }
+            else {
+                matchResult = 7;
+            }
+        }
+        else {
+            switch (iotype.tag) {
+                case 1: {
+                    matchResult = 1;
+                    break;
+                }
+                case 2: {
+                    matchResult = 2;
+                    break;
+                }
+                case 3: {
+                    matchResult = 3;
+                    break;
+                }
+                case 4: {
+                    matchResult = 4;
+                    break;
+                }
+                case 5: {
+                    matchResult = 5;
+                    break;
+                }
+                case 6: {
+                    matchResult = 6;
+                    break;
+                }
+                default:
+                    matchResult = 0;
+            }
+        }
+        switch (matchResult) {
+            case 0:
+                return "The source value must be a unique identifier for an organism or a sample.";
+            case 1:
+                return "The Sample Name column describes specifc laboratory samples with a unique identifier.";
+            case 2:
+                return "The Raw Data File column defines untransformed and unprocessed data files.";
+            case 3:
+                return "The Derived Data File column defines transformed and/or processed data files.";
+            case 4:
+                return "Placeholder";
+            case 5:
+                return "Placeholder";
+            case 6:
+                return "Placeholder";
+            default:
+                throw new Error(`Unable to parse combination to existing IOType: \`${iotype}\``);
+        }
+    }
 }
 
 export function IOType_$reflection() {
@@ -271,7 +429,7 @@ export class CompositeHeader extends Union {
     }
     get isOutput() {
         const this$ = this;
-        return this$.tag === 11;
+        return this$.tag === 12;
     }
     get isParameter() {
         const this$ = this;
@@ -334,6 +492,14 @@ export class CompositeHeader extends Union {
         const this$ = this;
         return this$.tag === 13;
     }
+    tryInput() {
+        const this$ = this;
+        return (this$.tag === 11) ? this$.fields[0] : void 0;
+    }
+    tryOutput() {
+        const this$ = this;
+        return (this$.tag === 12) ? this$.fields[0] : void 0;
+    }
     TryParameter() {
         const this$ = this;
         return (this$.tag === 3) ? ProtocolParameter_create_Z6C54B221(void 0, this$.fields[0]) : void 0;
@@ -350,6 +516,150 @@ export class CompositeHeader extends Union {
         const this$ = this;
         return (this$.tag === 0) ? Component_create_61502994(void 0, void 0, void 0, this$.fields[0]) : void 0;
     }
+    GetUITooltip() {
+        const this$ = this;
+        return CompositeHeader.getUITooltip(this$);
+    }
+    static getUITooltip(header) {
+        let matchResult;
+        if (typeof header === "string") {
+            if (equals(header, "Component")) {
+                matchResult = 0;
+            }
+            else if (equals(header, "Characteristic")) {
+                matchResult = 1;
+            }
+            else if (equals(header, "Factor")) {
+                matchResult = 2;
+            }
+            else if (equals(header, "Parameter")) {
+                matchResult = 3;
+            }
+            else if (equals(header, "ProtocolType")) {
+                matchResult = 4;
+            }
+            else if (equals(header, "ProtocolDescription")) {
+                matchResult = 5;
+            }
+            else if (equals(header, "ProtocolUri")) {
+                matchResult = 6;
+            }
+            else if (equals(header, "ProtocolVersion")) {
+                matchResult = 7;
+            }
+            else if (equals(header, "ProtocolREF")) {
+                matchResult = 8;
+            }
+            else if (equals(header, "Performer")) {
+                matchResult = 9;
+            }
+            else if (equals(header, "Date")) {
+                matchResult = 10;
+            }
+            else if (equals(header, "Input")) {
+                matchResult = 11;
+            }
+            else if (equals(header, "Output")) {
+                matchResult = 12;
+            }
+            else if (equals(header, "FreeText")) {
+                matchResult = 13;
+            }
+            else {
+                matchResult = 14;
+            }
+        }
+        else {
+            switch (header.tag) {
+                case 1: {
+                    matchResult = 1;
+                    break;
+                }
+                case 2: {
+                    matchResult = 2;
+                    break;
+                }
+                case 3: {
+                    matchResult = 3;
+                    break;
+                }
+                case 4: {
+                    matchResult = 4;
+                    break;
+                }
+                case 5: {
+                    matchResult = 5;
+                    break;
+                }
+                case 6: {
+                    matchResult = 6;
+                    break;
+                }
+                case 7: {
+                    matchResult = 7;
+                    break;
+                }
+                case 8: {
+                    matchResult = 8;
+                    break;
+                }
+                case 9: {
+                    matchResult = 9;
+                    break;
+                }
+                case 10: {
+                    matchResult = 10;
+                    break;
+                }
+                case 11: {
+                    matchResult = 11;
+                    break;
+                }
+                case 12: {
+                    matchResult = 12;
+                    break;
+                }
+                case 13: {
+                    matchResult = 13;
+                    break;
+                }
+                default:
+                    matchResult = 0;
+            }
+        }
+        switch (matchResult) {
+            case 0:
+                return "Component columns are used to describe physical components of a experiment, e.g. instrument names, software names, and reagents names.";
+            case 1:
+                return "Characteristic columns are used for study descriptions and describe inherent properties of the source material, e.g. a certain strain or organism part.";
+            case 2:
+                return "Use Factor columns to describe independent variables that result in a specific output of your experiment, e.g. the light intensity under which an organism was grown.";
+            case 3:
+                return "Parameter columns describe steps in your experimental workflow, e.g. the centrifugation time or the temperature used for your assay.";
+            case 4:
+                return "Defines the protocol type according to your preferred endpoint repository.";
+            case 5:
+                return "Describe the protocol in free text.";
+            case 6:
+                return "Web or local address where the in-depth protocol is stored.";
+            case 7:
+                return "Defines the protocol version.";
+            case 8:
+                return "Defines the protocol name.";
+            case 9:
+                return "Defines the protocol performer.";
+            case 10:
+                return "Defines the date the protocol was performed.";
+            case 11:
+                return "Only one input column per table. E.g. experimental samples or files.";
+            case 12:
+                return "Only one output column per table. E.g. experimental samples or files.";
+            case 13:
+                return "Placeholder";
+            default:
+                throw new Error(`Unable to parse combination to existing CompositeHeader: \`${header}\``);
+        }
+    }
 }
 
 export function CompositeHeader_$reflection() {

package/ISA/ISA/Helper.js

@@ -1,5 +1,6 @@
-import { isIterable, defaultOf, structuralHash, equals } from "../../fable_modules/fable-library.4.1.4/Util.js";
-import { value as value_1, some } from "../../fable_modules/fable-library.4.1.4/Option.js";
+import { some, value as value_1 } from "../../fable_modules/fable-library.4.1.4/Option.js";
+import { isIterable, defaultOf, structuralHash, equals, numberHash, identityHash } from "../../fable_modules/fable-library.4.1.4/Util.js";
+import { exactlyOne, partition, fold } from "../../fable_modules/fable-library.4.1.4/Array.js";
 import { empty, singleton, append, head, tail, isEmpty } from "../../fable_modules/fable-library.4.1.4/List.js";
 import { Dictionary } from "../../fable_modules/fable-library.4.1.4/MutableMap.js";
 import { isEmpty as isEmpty_1, iterate } from "../../fable_modules/fable-library.4.1.4/Seq.js";
@@ -7,7 +8,18 @@ import { tryGetValue, addToDict } from "../../fable_modules/fable-library.4.1.4/
 import { Union, toString, FSharpRef } from "../../fable_modules/fable-library.4.1.4/Types.js";
 import { append_generic, distinct_generic, isList_generic, isMap_generic } from "./Fable.js";
 import { union_type, makeUnion, option_type, makeGenericType, getUnionCases, name, obj_type } from "../../fable_modules/fable-library.4.1.4/Reflection.js";
-import { exactlyOne, partition } from "../../fable_modules/fable-library.4.1.4/Array.js";
+
+export function HashCodes_boxHashOption(a) {
+    let copyOfStruct, copyOfStruct_1;
+    return (a != null) ? ((copyOfStruct = value_1(a), identityHash(copyOfStruct))) : ((copyOfStruct_1 = 0, numberHash(copyOfStruct_1)));
+}
+
+export function HashCodes_boxHashArray(a) {
+    return fold((acc, o) => {
+        let copyOfStruct;
+        return ((-1640531527 + ((copyOfStruct = o, identityHash(copyOfStruct)))) + (acc << 6)) + (acc >> 2);
+    }, 0, a);
+}
 
 /**
  * If the value matches the default, a None is returned, else a Some is returned

package/ISA/ISA/Regex.js

@@ -49,7 +49,7 @@ export function ActivePatterns_$007CReferenceColumnHeader$007C_$007C(input) {
  * Matches any column header starting with some text, followed by one whitespace and a term name inside squared brackets.
  */
 export function ActivePatterns_$007CTermColumn$007C_$007C(input) {
-    const activePatternResult = ActivePatterns_$007CRegex$007C_$007C("(?<termcolumntype>.+)\\s\\[(?<termname>.+)\\]", input);
+    const activePatternResult = ActivePatterns_$007CRegex$007C_$007C("(?<termcolumntype>.+?)\\s\\[(?<termname>.+)\\]", input);
     if (activePatternResult != null) {
         const r = activePatternResult;
         return {

package/ISA/ISA.Json/Assay.js

@@ -12,7 +12,7 @@ import { ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetI
 import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "./Ontology.js";
 import { Process_decoder, Process_encoder } from "./Process.js";
 import { decoder as decoder_5, encoder } from "./Comment.js";
-import { fromString, uri } from "./Decode.js";
+import { fromJsonString, uri } from "./Decode.js";
 import { Assay } from "../ISA/JsonTypes/Assay.js";
 import { ArcAssay } from "../ISA/ArcTypes/ArcTypes.js";
 
@@ -88,11 +88,11 @@ export function Assay_decoder(options) {
     }, path_7, v));
 }
 
-export function Assay_fromString(s) {
-    return fromString(uncurry2(Assay_decoder(ConverterOptions_$ctor())), s);
+export function Assay_fromJsonString(s) {
+    return fromJsonString(uncurry2(Assay_decoder(ConverterOptions_$ctor())), s);
 }
 
-export function Assay_toString(p) {
+export function Assay_toJsonString(p) {
     return toString(2, Assay_encoder(ConverterOptions_$ctor(), p));
 }
 
@@ -104,12 +104,12 @@ export function Assay_toStringLD(a) {
     return toString(2, Assay_encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), a));
 }
 
-export function ArcAssay_fromString(s) {
-    const arg = fromString(uncurry2(Assay_decoder(ConverterOptions_$ctor())), s);
+export function ArcAssay_fromJsonString(s) {
+    const arg = fromJsonString(uncurry2(Assay_decoder(ConverterOptions_$ctor())), s);
     return ArcAssay.fromAssay(arg);
 }
 
-export function ArcAssay_toString(a) {
+export function ArcAssay_toJsonString(a) {
     return toString(2, Assay_encoder(ConverterOptions_$ctor(), a.ToAssay()));
 }
 

package/ISA/ISA.Json/Comment.js

@@ -1,14 +1,14 @@
 import { replace } from "../../fable_modules/fable-library.4.1.4/String.js";
 import { value as value_13 } from "../../fable_modules/fable-library.4.1.4/Option.js";
 import { URIModule_toString } from "../ISA/JsonTypes/URI.js";
-import { toString as toString_1, nil, object as object_6 } from "../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
+import { toString, nil, object as object_6 } from "../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
 import { choose } from "../../fable_modules/fable-library.4.1.4/List.js";
 import { uncurry2, equals } from "../../fable_modules/fable-library.4.1.4/Util.js";
 import { empty, singleton, append, delay, toList } from "../../fable_modules/fable-library.4.1.4/Seq.js";
 import { ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions_$ctor, ConverterOptions__get_IncludeType, ConverterOptions__get_SetID } from "./ConverterOptions.js";
 import { tryInclude } from "./GEncode.js";
 import { string, object as object_7 } from "../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
-import { fromString as fromString_1, uri } from "./Decode.js";
+import { fromJsonString as fromJsonString_1, uri } from "./Decode.js";
 import { Comment$ } from "../ISA/JsonTypes/Comment.js";
 
 export function genID(c) {
@@ -66,12 +66,12 @@ export function decoder(options) {
     }, path_2, v));
 }
 
-export function fromString(s) {
-    return fromString_1(uncurry2(decoder(ConverterOptions_$ctor())), s);
+export function fromJsonString(s) {
+    return fromJsonString_1(uncurry2(decoder(ConverterOptions_$ctor())), s);
 }
 
-export function toString(c) {
-    return toString_1(2, encoder(ConverterOptions_$ctor(), c));
+export function toJsonString(c) {
+    return toString(2, encoder(ConverterOptions_$ctor(), c));
 }
 
 /**
@@ -79,6 +79,6 @@ export function toString(c) {
  */
 export function toStringLD(c) {
     let returnVal;
-    return toString_1(2, encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), c));
+    return toString(2, encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), c));
 }
 

package/ISA/ISA.Json/Data.js

@@ -10,7 +10,7 @@ import { empty, singleton, append, delay, toList } from "../../fable_modules/fab
 import { ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions_$ctor, ConverterOptions__get_IncludeType, ConverterOptions__get_SetID } from "./ConverterOptions.js";
 import { tryInclude } from "./GEncode.js";
 import { decoder as decoder_3, encoder } from "./Comment.js";
-import { fromString, uri, hasUnknownFields } from "./Decode.js";
+import { fromJsonString, uri, hasUnknownFields } from "./Decode.js";
 import { Data } from "../ISA/JsonTypes/Data.js";
 import { replace } from "../../fable_modules/fable-library.4.1.4/String.js";
 import { MaterialAttributeValue_decoder, MaterialAttributeValue_encoder } from "./Material.js";
@@ -110,12 +110,12 @@ export function Data_decoder(options, s, json) {
     }
 }
 
-export function Data_fromString(s) {
+export function Data_fromJsonString(s) {
     let options;
-    return fromString(uncurry2((options = ConverterOptions_$ctor(), (s_1) => ((json) => Data_decoder(options, s_1, json)))), s);
+    return fromJsonString(uncurry2((options = ConverterOptions_$ctor(), (s_1) => ((json) => Data_decoder(options, s_1, json)))), s);
 }
 
-export function Data_toString(m) {
+export function Data_toJsonString(m) {
     return toString(2, Data_encoder(ConverterOptions_$ctor(), m));
 }
 
@@ -181,12 +181,12 @@ export function Source_decoder(options, s, json) {
     }
 }
 
-export function Source_fromString(s) {
+export function Source_fromJsonString(s) {
     let options;
-    return fromString(uncurry2((options = ConverterOptions_$ctor(), (s_1) => ((json) => Source_decoder(options, s_1, json)))), s);
+    return fromJsonString(uncurry2((options = ConverterOptions_$ctor(), (s_1) => ((json) => Source_decoder(options, s_1, json)))), s);
 }
 
-export function Source_toString(m) {
+export function Source_toJsonString(m) {
     return toString(2, Source_encoder(ConverterOptions_$ctor(), m));
 }
 
@@ -252,12 +252,12 @@ export function Sample_decoder(options, s, json) {
     }
 }
 
-export function Sample_fromString(s) {
+export function Sample_fromJsonString(s) {
     let options;
-    return fromString(uncurry2((options = ConverterOptions_$ctor(), (s_1) => ((json) => Sample_decoder(options, s_1, json)))), s);
+    return fromJsonString(uncurry2((options = ConverterOptions_$ctor(), (s_1) => ((json) => Sample_decoder(options, s_1, json)))), s);
 }
 
-export function Sample_toString(m) {
+export function Sample_toJsonString(m) {
     return toString(2, Sample_encoder(ConverterOptions_$ctor(), m));
 }
 

package/ISA/ISA.Json/Decode.js

@@ -1,4 +1,4 @@
-import { fromString as fromString_1, string } from "../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
+import { fromString, string } from "../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
 import { FSharpResult$2 } from "../../fable_modules/fable-library.4.1.4/Choice.js";
 import { printf, toText } from "../../fable_modules/fable-library.4.1.4/String.js";
 import { ErrorReason } from "../../fable_modules/Thoth.Json.10.1.0/Types.fs.js";
@@ -23,8 +23,8 @@ export function uri(s, json) {
     }
 }
 
-export function fromString(decoder, s) {
-    const matchValue = fromString_1(decoder, s);
+export function fromJsonString(decoder, s) {
+    const matchValue = fromString(decoder, s);
     if (matchValue.tag === 1) {
         throw new Error(toText(printf("Error decoding string: %s"))(matchValue.fields[0]));
     }

package/ISA/ISA.Json/Factor.js

@@ -3,7 +3,7 @@ import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "./Ontolo
 import { object as object_8, toString, nil } from "../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
 import { array, object as object_9, string, float, int } from "../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
 import { FSharpResult$2 } from "../../fable_modules/fable-library.4.1.4/Choice.js";
-import { uri, fromString } from "./Decode.js";
+import { uri, fromJsonString } from "./Decode.js";
 import { equals, uncurry2 } from "../../fable_modules/fable-library.4.1.4/Util.js";
 import { ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions__get_IncludeType, ConverterOptions__get_SetID, ConverterOptions_$ctor } from "./ConverterOptions.js";
 import { replace } from "../../fable_modules/fable-library.4.1.4/String.js";
@@ -63,12 +63,12 @@ export function Value_decoder(options, s, json) {
     }
 }
 
-export function Value_fromString(s) {
+export function Value_fromJsonString(s) {
     let options;
-    return fromString(uncurry2((options = ConverterOptions_$ctor(), (s_1) => ((json) => Value_decoder(options, s_1, json)))), s);
+    return fromJsonString(uncurry2((options = ConverterOptions_$ctor(), (s_1) => ((json) => Value_decoder(options, s_1, json)))), s);
 }
 
-export function Value_toString(v) {
+export function Value_toJsonString(v) {
     return toString(2, Value_encoder(ConverterOptions_$ctor(), v));
 }
 
@@ -121,11 +121,11 @@ export function Factor_decoder(options) {
     }, path_2, v));
 }
 
-export function Factor_fromString(s) {
-    return fromString(uncurry2(Factor_decoder(ConverterOptions_$ctor())), s);
+export function Factor_fromJsonString(s) {
+    return fromJsonString(uncurry2(Factor_decoder(ConverterOptions_$ctor())), s);
 }
 
-export function Factor_toString(f) {
+export function Factor_toJsonString(f) {
     return toString(2, Factor_encoder(ConverterOptions_$ctor(), f));
 }
 
@@ -176,11 +176,11 @@ export function FactorValue_decoder(options) {
     }, path, v));
 }
 
-export function FactorValue_fromString(s) {
-    return fromString(uncurry2(FactorValue_decoder(ConverterOptions_$ctor())), s);
+export function FactorValue_fromJsonString(s) {
+    return fromJsonString(uncurry2(FactorValue_decoder(ConverterOptions_$ctor())), s);
 }
 
-export function FactorValue_toString(f) {
+export function FactorValue_toJsonString(f) {
     return toString(2, FactorValue_encoder(ConverterOptions_$ctor(), f));
 }
 

package/ISA/ISA.Json/Investigation.js

@@ -13,7 +13,7 @@ import { Study_decoder, Study_encoder } from "./Study.js";
 import { decoder as decoder_7, encoder as encoder_2 } from "./Comment.js";
 import { list as list_1, string, object as object_25 } from "../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
 import { Investigation } from "../ISA/JsonTypes/Investigation.js";
-import { fromString } from "./Decode.js";
+import { fromJsonString } from "./Decode.js";
 import { ArcInvestigation } from "../ISA/ArcTypes/ArcTypes.js";
 
 export function Investigation_genID(i) {
@@ -97,11 +97,11 @@ export function Investigation_decoder(options) {
     }, path_12, v));
 }
 
-export function Investigation_fromString(s) {
-    return fromString(uncurry2(Investigation_decoder(ConverterOptions_$ctor())), s);
+export function Investigation_fromJsonString(s) {
+    return fromJsonString(uncurry2(Investigation_decoder(ConverterOptions_$ctor())), s);
 }
 
-export function Investigation_toString(p) {
+export function Investigation_toJsonString(p) {
     return toString(2, Investigation_encoder(ConverterOptions_$ctor(), p));
 }
 
@@ -113,12 +113,12 @@ export function Investigation_toStringLD(i) {
     return toString(2, Investigation_encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), i));
 }
 
-export function ArcInvestigation_fromString(s) {
-    const arg = fromString(uncurry2(Investigation_decoder(ConverterOptions_$ctor())), s);
+export function ArcInvestigation_fromJsonString(s) {
+    const arg = fromJsonString(uncurry2(Investigation_decoder(ConverterOptions_$ctor())), s);
     return ArcInvestigation.fromInvestigation(arg);
 }
 
-export function ArcInvestigation_toString(a) {
+export function ArcInvestigation_toJsonString(a) {
     return toString(2, Investigation_encoder(ConverterOptions_$ctor(), a.ToInvestigation()));
 }