@nfdi4plants/arctrl 3.1.0 → 3.2.0

package/dist/ts/ts/Core/OntologyAnnotation.js

@@ -1,14 +1,14 @@
-import { value, defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { value, defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { createOAUri } from './Helper/Url.js';
 import { tryParseTermAnnotation, ActivePatterns_$007CRegex$007C_$007C, Pattern_TermAnnotationShortPattern } from './Helper/Regex.js';
-import { StringBuilder_$ctor, StringBuilder__Append_Z721C83C5 } from '../../node_modules/@fable-org/fable-library-js/System.Text.js';
-import { join, toText, printf } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { toList, delay, append, singleton, empty } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { toString } from '../../node_modules/@fable-org/fable-library-js/Types.js';
-import { mergeHashes } from './Helper/HashCodes.js';
-import { stringHash, safeHash } from '../../node_modules/@fable-org/fable-library-js/Util.js';
+import { concat, join, toText, printf } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { StringBuilder_$ctor, StringBuilder__Append_Z721C83C5 } from '../../node_modules/@fable-org/fable-library-ts/System.Text.js';
+import { toList, delay, append, singleton, empty } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { toString } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
+import { hashString, mergeHashes } from './Helper/HashCodes.js';
 import { ResizeArray_map } from './Helper/Collections.js';
-import { class_type } from '../../node_modules/@fable-org/fable-library-js/Reflection.js';
+import { safeHash, comparePrimitives } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { class_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 
 class OntologyAnnotation {
   constructor(name, tsr, tan, comments) {
@@ -55,6 +55,11 @@ class OntologyAnnotation {
   static make(name, tsr, tan, comments) {
     return new OntologyAnnotation(unwrap(name), unwrap(tsr), unwrap(tan), comments);
   }
+  /**
+   * Create a ISAJson Ontology Annotation value from ISATab string entries, will try to reduce `termAccessionNumber` with regex matching.
+   * 
+   * Exmp. 1: http://purl.obolibrary.org/obo/GO_000001 --> GO:000001
+   */
   static create(name, tsr, tan, comments) {
     const comments_1 = defaultArg(comments, []);
     return OntologyAnnotation.make(name, tsr, tan, comments_1);
@@ -67,6 +72,9 @@ class OntologyAnnotation {
     const this$ = this;
     return defaultArg(this$.Name, "");
   }
+  /**
+   * Create a path in form of `http://purl.obolibrary.org/obo/MS_1000121` from it's Term Accession Source `MS` and Local Term Accession Number `1000121`.
+   */
   static createUriAnnotation(termSourceRef, localTAN) {
     return createOAUri(termSourceRef, localTAN);
   }
@@ -80,12 +88,17 @@ class OntologyAnnotation {
       return OntologyAnnotation.create(unwrap(name), r.IDSpace, accession);
     }
   }
+  /**
+   * Parses any value in `TermAccessionString` to term accession format "termsourceref:localtan". Exmp.: "MS:000001".
+   * 
+   * If `TermAccessionString` cannot be parsed to this format, returns empty string!
+   */
   get TermAccessionShort() {
     const this$ = this;
     const matchValue = this$.TANInfo;
     if (matchValue != null) {
       const id = value(matchValue);
-      return `${id.IDSpace}:${id.LocalID}`;
+      return concat(id.IDSpace, ":", id.LocalID);
     } else {
       return "";
     }
@@ -110,8 +123,13 @@ class OntologyAnnotation {
       return "";
     }
   }
+  /**
+   * Get a ISATab string entries from an ISAJson Ontology Annotation object (name,source,accession)
+   * 
+   * `asOntobeePurlUrl`: option to return term accession in Ontobee purl-url format (`http://purl.obolibrary.org/obo/MS_1000121`)
+   */
   static toStringObject(oa, asOntobeePurlUrlIfShort) {
-    let url;
+    let url = void 0;
     const asOntobeePurlUrlIfShort_1 = defaultArg(asOntobeePurlUrlIfShort, false);
     const TermName = defaultArg(oa.Name, "");
     const TermSourceREF = defaultArg(oa.TermSourceREF, "");
@@ -126,13 +144,13 @@ class OntologyAnnotation {
     const sb = StringBuilder_$ctor();
     StringBuilder__Append_Z721C83C5(sb, "{");
     StringBuilder__Append_Z721C83C5(sb, join("; ", toList(delay(() => {
-      let arg;
+      let arg = void 0;
       return append(this$.Name != null ? singleton((arg = value(this$.Name), toText(printf("Name = %A"))(arg))) : empty(), delay(() => {
-        let arg_1;
+        let arg_1 = void 0;
         return append(this$.TermSourceREF != null ? singleton((arg_1 = value(this$.TermSourceREF), toText(printf("TSR = %A"))(arg_1))) : empty(), delay(() => {
-          let arg_2;
+          let arg_2 = void 0;
           return append(this$.TermAccessionNumber != null ? singleton((arg_2 = value(this$.TermAccessionNumber), toText(printf("TAN = %A"))(arg_2))) : empty(), delay(() => {
-            let arg_3;
+            let arg_3 = void 0;
             return this$.Comments.length !== 0 ? singleton((arg_3 = this$.Comments, toText(printf("Comments = %A"))(arg_3))) : empty();
           }));
         }));
@@ -146,19 +164,19 @@ class OntologyAnnotation {
     return this$.Name == null && this$.TermSourceREF == null && this$.TermAccessionNumber == null && this$.Comments.length === 0;
   }
   GetHashCode() {
-    let matchValue, matchValue_1, matchValue_2, tsr_1, matchValue_4, tan, taninfo_1, tsr, taninfo;
+    let matchValue = void 0, matchValue_1 = void 0, matchValue_2 = void 0, tsr_1 = void 0, matchValue_4 = void 0, tan = void 0, taninfo_1 = void 0, tsr = void 0, taninfo = void 0;
     const this$ = this;
-    return mergeHashes((matchValue = this$.Name, matchValue == null ? 0 : stringHash(value(matchValue))), (matchValue_1 = this$.TermSourceREF, matchValue_2 = this$.TANInfo, matchValue_1 != null ? matchValue_2 == null ? (tsr_1 = value(matchValue_1), matchValue_4 = this$.TermAccessionNumber, matchValue_4 == null ? stringHash(tsr_1.toLocaleLowerCase()) : (tan = value(matchValue_4), mergeHashes(stringHash(tsr_1.toLocaleLowerCase()), stringHash(tan)))) : (taninfo_1 = value(matchValue_2), tsr = value(matchValue_1), mergeHashes(stringHash(tsr.toLocaleLowerCase()), stringHash(taninfo_1.LocalID))) : matchValue_2 == null ? 0 : (taninfo = value(matchValue_2), mergeHashes(stringHash(taninfo.IDSpace.toLocaleLowerCase()), stringHash(taninfo.LocalID))))) | 0;
+    const hash = (s) => hashString(s) | 0;
+    return mergeHashes((matchValue = this$.Name, matchValue == null ? 0 : hash(value(matchValue))), (matchValue_1 = this$.TermSourceREF, matchValue_2 = this$.TANInfo, matchValue_1 != null ? matchValue_2 == null ? (tsr_1 = value(matchValue_1), matchValue_4 = this$.TermAccessionNumber, matchValue_4 == null ? hash(tsr_1.toLocaleLowerCase()) : (tan = value(matchValue_4), mergeHashes(hash(tsr_1.toLocaleLowerCase()), hash(tan)))) : (taninfo_1 = value(matchValue_2), tsr = value(matchValue_1), mergeHashes(hash(tsr.toLocaleLowerCase()), hash(taninfo_1.LocalID))) : matchValue_2 == null ? 0 : (taninfo = value(matchValue_2), mergeHashes(hash(taninfo.IDSpace.toLocaleLowerCase()), hash(taninfo.LocalID))))) | 0;
   }
   Equals(obj) {
-    let matchValue_8, matchValue_9, t1_1, t2_1, matchValue_5, matchValue_6, t1, t2;
     const this$ = this;
     if (obj instanceof OntologyAnnotation) {
       const oa = obj;
       let equalName;
       const matchValue = this$.Name;
       const matchValue_1 = oa.Name;
-      let matchResult, n1, n2;
+      let matchResult = void 0, n1 = void 0, n2 = void 0;
       if (matchValue == null) {
         if (matchValue_1 == null) {
           matchResult = 1;
@@ -186,34 +204,65 @@ class OntologyAnnotation {
       }
       const matchValue_3 = this$.TANInfo;
       if (matchValue_3 == null) {
-        if (equalName && (matchValue_8 = this$.TermSourceREF, matchValue_9 = oa.TermSourceREF, matchValue_8 == null ? matchValue_9 == null : matchValue_9 != null && (t1_1 = value(matchValue_8), t2_1 = value(matchValue_9), t1_1.toLocaleLowerCase() === t2_1.toLocaleLowerCase()))) {
-          const matchValue_11 = this$.TermAccessionNumber;
-          const matchValue_12 = oa.TermAccessionNumber;
-          let matchResult_1, tan1, tan2;
-          if (matchValue_11 == null) {
-            if (matchValue_12 == null) {
-              matchResult_1 = 1;
-            } else {
-              matchResult_1 = 2;
-            }
-          } else if (matchValue_12 != null) {
-            matchResult_1 = 0;
-            tan1 = value(matchValue_11);
-            tan2 = value(matchValue_12);
+        let equalTSR_1;
+        const matchValue_8 = this$.TermSourceREF;
+        const matchValue_9 = oa.TermSourceREF;
+        let matchResult_1 = void 0, t1_1 = void 0, t2_1 = void 0;
+        if (matchValue_8 == null) {
+          if (matchValue_9 == null) {
+            matchResult_1 = 1;
           } else {
             matchResult_1 = 2;
           }
-          switch (matchResult_1) {
-            case 0:
-              return tan1.toLocaleLowerCase() === tan2.toLocaleLowerCase();
-            case 1:
-              return true;
-            default:
-              return false;
+        } else if (matchValue_9 != null) {
+          matchResult_1 = 0;
+          t1_1 = value(matchValue_8);
+          t2_1 = value(matchValue_9);
+        } else {
+          matchResult_1 = 2;
+        }
+        switch (matchResult_1) {
+          case 0: {
+            equalTSR_1 = t1_1.toLocaleLowerCase() === t2_1.toLocaleLowerCase();
+            break;
           }
+          case 1: {
+            equalTSR_1 = true;
+            break;
+          }
+          default:
+            equalTSR_1 = false;
+        }
+        let equalTAN;
+        const matchValue_11 = this$.TermAccessionNumber;
+        const matchValue_12 = oa.TermAccessionNumber;
+        let matchResult_2 = void 0, tan1 = void 0, tan2 = void 0;
+        if (matchValue_11 == null) {
+          if (matchValue_12 == null) {
+            matchResult_2 = 1;
+          } else {
+            matchResult_2 = 2;
+          }
+        } else if (matchValue_12 != null) {
+          matchResult_2 = 0;
+          tan1 = value(matchValue_11);
+          tan2 = value(matchValue_12);
         } else {
-          return false;
+          matchResult_2 = 2;
         }
+        switch (matchResult_2) {
+          case 0: {
+            equalTAN = tan1.toLocaleLowerCase() === tan2.toLocaleLowerCase();
+            break;
+          }
+          case 1: {
+            equalTAN = true;
+            break;
+          }
+          default:
+            equalTAN = false;
+        }
+        return equalName && equalTSR_1 && equalTAN;
       } else {
         const taninfo1 = value(matchValue_3);
         const matchValue_4 = oa.TANInfo;
@@ -221,7 +270,30 @@ class OntologyAnnotation {
           return false;
         } else {
           const taninfo2 = value(matchValue_4);
-          return equalName && (matchValue_5 = this$.TermSourceREF, matchValue_6 = oa.TermSourceREF, matchValue_5 != null ? matchValue_6 != null ? (t1 = value(matchValue_5), t2 = value(matchValue_6), t1.toLocaleLowerCase() === t2.toLocaleLowerCase()) : true : true) && taninfo1.IDSpace.toLocaleLowerCase() === taninfo2.IDSpace.toLocaleLowerCase() && taninfo1.LocalID === taninfo2.LocalID;
+          let equalTSR;
+          const matchValue_5 = this$.TermSourceREF;
+          const matchValue_6 = oa.TermSourceREF;
+          let matchResult_3 = void 0, t1 = void 0, t2 = void 0;
+          if (matchValue_5 != null) {
+            if (matchValue_6 != null) {
+              matchResult_3 = 0;
+              t1 = value(matchValue_5);
+              t2 = value(matchValue_6);
+            } else {
+              matchResult_3 = 1;
+            }
+          } else {
+            matchResult_3 = 1;
+          }
+          switch (matchResult_3) {
+            case 0: {
+              equalTSR = t1.toLocaleLowerCase() === t2.toLocaleLowerCase();
+              break;
+            }
+            default:
+              equalTSR = true;
+          }
+          return equalName && equalTSR && taninfo1.IDSpace.toLocaleLowerCase() === taninfo2.IDSpace.toLocaleLowerCase() && taninfo1.LocalID === taninfo2.LocalID;
         }
       }
     } else {
@@ -237,7 +309,7 @@ class OntologyAnnotation {
     return OntologyAnnotation.make(name, tsr, tan, nextComments);
   }
   static computeTanInfo(tan, tsr) {
-    let tsr_1;
+    let tsr_1 = void 0;
     if (tan == null) {
       return void 0;
     } else {
@@ -261,9 +333,8 @@ class OntologyAnnotation {
     const this$ = this;
     if (obj instanceof OntologyAnnotation) {
       const oa = obj;
-      const hash = safeHash(this$) | 0;
-      const otherHash = safeHash(oa) | 0;
-      return (hash === otherHash ? 0 : hash < otherHash ? -1 : 1) | 0;
+      let copyOfStruct = safeHash(this$);
+      return comparePrimitives(copyOfStruct, safeHash(oa)) | 0;
     } else {
       return 1;
     }

package/dist/ts/ts/Core/OntologySourceReference.d.ts

@@ -1,7 +1,7 @@
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { Comment$ } from './Comment.js';
-import { int32 } from '@fable-org/fable-library-js/Int32.js';
-import { TypeInfo } from '@fable-org/fable-library-js/Reflection.js';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { Comment$ } from './Comment.ts';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { TypeInfo } from '@fable-org/fable-library-ts/Reflection.ts';
 export declare class OntologySourceReference {
     _description: Option<string>;
     _file: Option<string>;

package/dist/ts/ts/Core/OntologySourceReference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OntologySourceReference.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Core/OntologySourceReference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAU,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGxC,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAE7D,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAEjF,qBAAa,uBAAuB;IAChC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACzB,SAAS,EAAE,QAAQ,EAAE,CAAC;gBACV,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE;IAOvG,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAGpC;IACD,IAAI,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAG1C;IACD,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAG7B;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAG5B;IACD,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAG7B;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAG5B;IACD,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAGhC;IACD,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAGlC;IACD,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAGzB;IACD,IAAI,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAGhC;IACD,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,uBAAuB;IAG5J,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,GAAG,uBAAuB;IAInI,MAAM,KAAK,KAAK,IAAI,uBAAuB,CAE1C;IACD,IAAI,IAAI,uBAAuB;IAS/B,WAAW,IAAI,KAAK;IAIpB,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;CAK5B;AAED,wBAAgB,mCAAmC,IAAI,QAAQ,CAE9D;AAED,wBAAgB,sCAAsC,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,GAAG,uBAAuB,CAE3K"}
+{"version":3,"file":"OntologySourceReference.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Core/OntologySourceReference.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,MAAM,EAAU,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGxC,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAE7D,OAAO,EAAc,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAEjF,qBAAa,uBAAuB;IAChC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACzB,SAAS,EAAE,QAAQ,EAAE,CAAC;gBACV,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE;IAOvG,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAGpC;IACD,IAAI,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAG1C;IACD,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAG7B;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAG5B;IACD,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAG7B;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAG5B;IACD,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAGhC;IACD,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAGlC;IACD,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAGzB;IACD,IAAI,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAGhC;IACD,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,uBAAuB;IAG5J,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,GAAG,uBAAuB;IAInI,MAAM,KAAK,KAAK,IAAI,uBAAuB,CAE1C;IACD,IAAI,IAAI,uBAAuB;IAS/B,WAAW,IAAI,KAAK;IAIpB,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;CAK5B;AAED,wBAAgB,mCAAmC,IAAI,QAAQ,CAE9D;AAED,wBAAgB,sCAAsC,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,GAAG,uBAAuB,CAE3K"}

package/dist/ts/ts/Core/OntologySourceReference.js

@@ -1,8 +1,8 @@
-import { defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-js/Option.js';
+import { defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { ResizeArray_map } from './Helper/Collections.js';
 import { boxHashArray, boxHashOption, boxHashSeq } from './Helper/HashCodes.js';
-import { safeHash } from '../../node_modules/@fable-org/fable-library-js/Util.js';
-import { class_type } from '../../node_modules/@fable-org/fable-library-js/Reflection.js';
+import { safeHash } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { class_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 
 class OntologySourceReference {
   constructor(description, file, name, version, comments) {
@@ -76,7 +76,7 @@ class OntologySourceReference {
     return boxHashArray([boxHashOption(this$.Description), boxHashOption(this$.File), boxHashOption(this$.Name), boxHashOption(this$.Version), boxHashSeq(this$.Comments)]) | 0;
   }
   Equals(obj) {
-    let t;
+    let t = void 0;
     const this$ = this;
     return obj instanceof OntologySourceReference && (t = obj, safeHash(this$) === safeHash(t));
   }

package/dist/ts/ts/Core/Person.d.ts

@@ -1,9 +1,10 @@
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { OntologyAnnotation } from './OntologyAnnotation.js';
-import { Comment$ } from './Comment.js';
-import { FSharpList } from '@fable-org/fable-library-js/List.js';
-import { int32 } from '@fable-org/fable-library-js/Int32.js';
-import { TypeInfo } from '@fable-org/fable-library-js/Reflection.js';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { OntologyAnnotation } from './OntologyAnnotation.ts';
+import { Comment$ } from './Comment.ts';
+import { MutableArray } from '@fable-org/fable-library-ts/Util.ts';
+import { FSharpList } from '@fable-org/fable-library-ts/List.ts';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { TypeInfo } from '@fable-org/fable-library-ts/Reflection.ts';
 export declare class Person {
     _orcid: Option<string>;
     _lastName: Option<string>;
@@ -42,10 +43,19 @@ export declare class Person {
     static make(orcid: Option<string>, lastName: Option<string>, firstName: Option<string>, midInitials: Option<string>, email: Option<string>, phone: Option<string>, fax: Option<string>, address: Option<string>, affiliation: Option<string>, roles: OntologyAnnotation[], comments: Comment$[]): Person;
     static create(orcid?: string, lastName?: string, firstName?: string, midInitials?: string, email?: string, phone?: string, fax?: string, address?: string, affiliation?: string, roles?: OntologyAnnotation[], comments?: Comment$[]): Person;
     static get empty(): Person;
-    static tryGetByFullName(firstName: string, midInitials: string, lastName: string, persons: Person[]): Option<Person>;
-    static existsByFullName(firstName: string, midInitials: string, lastName: string, persons: Person[]): boolean;
+    static tryGetByFullName(firstName: string, midInitials: string, lastName: string, persons: MutableArray<Person>): Option<Person>;
+    /**
+     * If an person with the given FirstName, MidInitials and LastName exists in the list, returns true
+     */
+    static existsByFullName(firstName: string, midInitials: string, lastName: string, persons: MutableArray<Person>): boolean;
+    /**
+     * adds the given person to the persons
+     */
     static add(persons: FSharpList<Person>, person: Person): FSharpList<Person>;
-    static removeByFullName(firstName: string, midInitials: string, lastName: string, persons: Person[]): Person[];
+    /**
+     * If a person with the given FirstName, MidInitials and LastName exists in the list, removes it
+     */
+    static removeByFullName(firstName: string, midInitials: string, lastName: string, persons: MutableArray<Person>): MutableArray<Person>;
     Copy(): Person;
     GetHashCode(): int32;
     Equals(obj: any): boolean;

package/dist/ts/ts/Core/Person.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Person.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Core/Person.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Person.d.ts","sourceRoot":"","sources":["../../../../src/ARCtrl/ts/Core/Person.ts"],"names":[],"mappings":"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"}

package/dist/ts/ts/Core/Person.js

@@ -1,14 +1,14 @@
-import { defaultArg, unwrap, map as map$1 } from '../../node_modules/@fable-org/fable-library-js/Option.js';
-import { tryFind } from '../../node_modules/@fable-org/fable-library-js/Array.js';
-import { equals } from '../../node_modules/@fable-org/fable-library-js/Util.js';
-import { append, singleton, map, choose, ofArray } from '../../node_modules/@fable-org/fable-library-js/List.js';
+import { defaultArg, unwrap, value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { tryFind } from '../../node_modules/@fable-org/fable-library-ts/Array.js';
+import { equals } from '../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { append, singleton, map, choose, ofArray } from '../../node_modules/@fable-org/fable-library-ts/List.js';
 import { ResizeArray_map } from './Helper/Collections.js';
 import { boxHashArray, boxHashOption, boxHashSeq, hash } from './Helper/HashCodes.js';
-import { StringBuilder_$ctor, StringBuilder__Append_Z721C83C5 } from '../../node_modules/@fable-org/fable-library-js/System.Text.js';
-import { join, toText, printf } from '../../node_modules/@fable-org/fable-library-js/String.js';
-import { length } from '../../node_modules/@fable-org/fable-library-js/Seq.js';
-import { toString } from '../../node_modules/@fable-org/fable-library-js/Types.js';
-import { class_type } from '../../node_modules/@fable-org/fable-library-js/Reflection.js';
+import { StringBuilder_$ctor, StringBuilder__Append_Z721C83C5 } from '../../node_modules/@fable-org/fable-library-ts/System.Text.js';
+import { join, toText, printf } from '../../node_modules/@fable-org/fable-library-ts/String.js';
+import { length } from '../../node_modules/@fable-org/fable-library-ts/Seq.js';
+import { toString } from '../../node_modules/@fable-org/fable-library-ts/Types.js';
+import { class_type } from '../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 
 class Person {
   constructor(orcid, lastName, firstName, midInitials, email, phone, fax, address, affiliation, roles, comments) {
@@ -138,12 +138,21 @@ class Person {
       }
     }, persons);
   }
+  /**
+   * If an person with the given FirstName, MidInitials and LastName exists in the list, returns true
+   */
   static existsByFullName(firstName, midInitials, lastName, persons) {
     return persons.some((p) => midInitials === "" ? equals(p.FirstName, firstName) && equals(p.LastName, lastName) : equals(p.FirstName, firstName) && equals(p.MidInitials, midInitials) && equals(p.LastName, lastName));
   }
+  /**
+   * adds the given person to the persons
+   */
   static add(persons, person) {
     return append(persons, singleton(person));
   }
+  /**
+   * If a person with the given FirstName, MidInitials and LastName exists in the list, removes it
+   */
   static removeByFullName(firstName, midInitials, lastName, persons) {
     return persons.filter((p) => midInitials === "" ? !(equals(p.FirstName, firstName) && equals(p.LastName, lastName)) : !(equals(p.FirstName, firstName) && equals(p.MidInitials, midInitials) && equals(p.LastName, lastName)));
   }
@@ -171,11 +180,18 @@ class Person {
     return hash(this$) === hash(obj);
   }
   toString() {
-    let arg, arg_1;
+    let arg = void 0, arg_1 = void 0;
     const this$ = this;
     const sb = StringBuilder_$ctor();
     StringBuilder__Append_Z721C83C5(sb, "Person {\n	");
-    StringBuilder__Append_Z721C83C5(sb, join(",\n	", map((tupledArg_1) => toText(printf("%s = %A"))(tupledArg_1[0])(tupledArg_1[1]), choose((tupledArg) => map$1((o) => [tupledArg[0], o], tupledArg[1]), ofArray([["FirstName", this$.FirstName], ["LastName", this$.LastName], ["MidInitials", this$.MidInitials], ["EMail", this$.EMail], ["Phone", this$.Phone], ["Address", this$.Address], ["Affiliation", this$.Affiliation], ["Fax", this$.Fax], ["ORCID", this$.ORCID], ["Roles", length(this$.Roles) > 0 ? (arg = this$.Roles, toText(printf("%A"))(arg)) : void 0], ["Comments", length(this$.Comments) > 0 ? (arg_1 = this$.Comments, toText(printf("%A"))(arg_1)) : void 0]])))));
+    StringBuilder__Append_Z721C83C5(sb, join(",\n	", map((tupledArg_1) => toText(printf("%s = %A"))(tupledArg_1[0])(tupledArg_1[1]), choose((tupledArg) => {
+      const option_1 = tupledArg[1];
+      if (option_1 != null) {
+        return [tupledArg[0], value(option_1)];
+      } else {
+        return void 0;
+      }
+    }, ofArray([["FirstName", this$.FirstName], ["LastName", this$.LastName], ["MidInitials", this$.MidInitials], ["EMail", this$.EMail], ["Phone", this$.Phone], ["Address", this$.Address], ["Affiliation", this$.Affiliation], ["Fax", this$.Fax], ["ORCID", this$.ORCID], ["Roles", length(this$.Roles) > 0 ? (arg = this$.Roles, toText(printf("%A"))(arg)) : void 0], ["Comments", length(this$.Comments) > 0 ? (arg_1 = this$.Comments, toText(printf("%A"))(arg_1)) : void 0]])))));
     StringBuilder__Append_Z721C83C5(sb, "\n}");
     return toString(sb);
   }

package/dist/ts/ts/Core/Process/ColumnIndex.d.ts

@@ -1,14 +1,14 @@
-import { int32 } from '@fable-org/fable-library-js/Int32.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { Comment$ } from '../Comment.js';
-import { OntologyAnnotation } from '../OntologyAnnotation.js';
-import { ProtocolParameter } from './ProtocolParameter.js';
-import { ProcessParameterValue } from './ProcessParameterValue.js';
-import { Factor } from './Factor.js';
-import { FactorValue } from './FactorValue.js';
-import { MaterialAttribute } from './MaterialAttribute.js';
-import { MaterialAttributeValue } from './MaterialAttributeValue.js';
-import { Component } from './Component.js';
+import { int32 } from '@fable-org/fable-library-ts/Int32.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { Comment$ } from '../Comment.ts';
+import { OntologyAnnotation } from '../OntologyAnnotation.ts';
+import { ProtocolParameter } from './ProtocolParameter.ts';
+import { ProcessParameterValue } from './ProcessParameterValue.ts';
+import { Factor } from './Factor.ts';
+import { FactorValue } from './FactorValue.ts';
+import { MaterialAttribute } from './MaterialAttribute.ts';
+import { MaterialAttributeValue } from './MaterialAttributeValue.ts';
+import { Component } from './Component.ts';
 export declare const orderName = "ColumnIndex";
 export declare function createOrderComment(index: int32): Comment$;
 export declare function tryGetIndex(comments: Comment$[]): Option<int32>;

package/dist/ts/ts/Core/Process/ColumnIndex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnIndex.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Core/Process/ColumnIndex.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ColumnIndex.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Core/Process/ColumnIndex.ts"],"names":[],"mappings":"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"}