@nfdi4plants/arctrl 3.2.2 → 3.3.0

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

@@ -1,4 +1,4 @@
-import { value, defaultArg, unwrap } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { defaultArg, unwrap, value } 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 { concat, join, toText, printf } from '../../node_modules/@fable-org/fable-library-ts/String.js';
@@ -12,9 +12,9 @@ import { class_type } from '../../node_modules/@fable-org/fable-library-ts/Refle
 
 class OntologyAnnotation {
   constructor(name, tsr, tan, comments) {
-    this._name = name == null ? void 0 : value(name) === "" ? void 0 : name;
-    this._termSourceREF = tsr == null ? void 0 : value(tsr) === "" ? void 0 : tsr;
-    this._termAccessionNumber = tan == null ? void 0 : value(tan) === "" ? void 0 : value(tan) === ":" ? void 0 : tan;
+    this._name = name == null ? void 0 : name === "" ? void 0 : name;
+    this._termSourceREF = tsr == null ? void 0 : tsr === "" ? void 0 : tsr;
+    this._termAccessionNumber = tan == null ? void 0 : tan === "" ? void 0 : tan === ":" ? void 0 : tan;
     this._comments = defaultArg(comments, []);
     this._tanInfo = OntologyAnnotation.computeTanInfo(unwrap(this._termAccessionNumber), unwrap(this._termSourceREF));
   }
@@ -83,7 +83,7 @@ class OntologyAnnotation {
     if (matchValue == null) {
       return OntologyAnnotation.create(unwrap(name), void 0, tan);
     } else {
-      const r = value(matchValue);
+      const r = matchValue;
       const accession = r.IDSpace + ":" + r.LocalID;
       return OntologyAnnotation.create(unwrap(name), r.IDSpace, accession);
     }
@@ -97,7 +97,7 @@ class OntologyAnnotation {
     const this$ = this;
     const matchValue = this$.TANInfo;
     if (matchValue != null) {
-      const id = value(matchValue);
+      const id = matchValue;
       return concat(id.IDSpace, ":", id.LocalID);
     } else {
       return "";
@@ -107,7 +107,7 @@ class OntologyAnnotation {
     const this$ = this;
     const matchValue = this$.TANInfo;
     if (matchValue != null) {
-      const id = value(matchValue);
+      const id = matchValue;
       return OntologyAnnotation.createUriAnnotation(id.IDSpace, id.LocalID);
     } else {
       return "";
@@ -117,7 +117,7 @@ class OntologyAnnotation {
     const this$ = this;
     const matchValue = this$.TermAccessionNumber;
     if (matchValue != null) {
-      const tan = value(matchValue);
+      const tan = matchValue;
       return ActivePatterns_$007CRegex$007C_$007C(Pattern_TermAnnotationShortPattern, tan) != null ? this$.TermAccessionOntobeeUrl : tan;
     } else {
       return "";
@@ -167,7 +167,7 @@ class OntologyAnnotation {
     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;
     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;
+    return mergeHashes((matchValue = this$.Name, matchValue == null ? 0 : hash(matchValue)), (matchValue_1 = this$.TermSourceREF, matchValue_2 = this$.TANInfo, matchValue_1 != null ? matchValue_2 == null ? (tsr_1 = matchValue_1, matchValue_4 = this$.TermAccessionNumber, matchValue_4 == null ? hash(tsr_1.toLocaleLowerCase()) : (tan = matchValue_4, mergeHashes(hash(tsr_1.toLocaleLowerCase()), hash(tan)))) : (taninfo_1 = matchValue_2, tsr = matchValue_1, mergeHashes(hash(tsr.toLocaleLowerCase()), hash(taninfo_1.LocalID))) : matchValue_2 == null ? 0 : (taninfo = matchValue_2, mergeHashes(hash(taninfo.IDSpace.toLocaleLowerCase()), hash(taninfo.LocalID))))) | 0;
   }
   Equals(obj) {
     const this$ = this;
@@ -185,8 +185,8 @@ class OntologyAnnotation {
         }
       } else if (matchValue_1 != null) {
         matchResult = 0;
-        n1 = value(matchValue);
-        n2 = value(matchValue_1);
+        n1 = matchValue;
+        n2 = matchValue_1;
       } else {
         matchResult = 2;
       }
@@ -216,8 +216,8 @@ class OntologyAnnotation {
           }
         } else if (matchValue_9 != null) {
           matchResult_1 = 0;
-          t1_1 = value(matchValue_8);
-          t2_1 = value(matchValue_9);
+          t1_1 = matchValue_8;
+          t2_1 = matchValue_9;
         } else {
           matchResult_1 = 2;
         }
@@ -245,8 +245,8 @@ class OntologyAnnotation {
           }
         } else if (matchValue_12 != null) {
           matchResult_2 = 0;
-          tan1 = value(matchValue_11);
-          tan2 = value(matchValue_12);
+          tan1 = matchValue_11;
+          tan2 = matchValue_12;
         } else {
           matchResult_2 = 2;
         }
@@ -264,12 +264,12 @@ class OntologyAnnotation {
         }
         return equalName && equalTSR_1 && equalTAN;
       } else {
-        const taninfo1 = value(matchValue_3);
+        const taninfo1 = matchValue_3;
         const matchValue_4 = oa.TANInfo;
         if (matchValue_4 == null) {
           return false;
         } else {
-          const taninfo2 = value(matchValue_4);
+          const taninfo2 = matchValue_4;
           let equalTSR;
           const matchValue_5 = this$.TermSourceREF;
           const matchValue_6 = oa.TermSourceREF;
@@ -277,8 +277,8 @@ class OntologyAnnotation {
           if (matchValue_5 != null) {
             if (matchValue_6 != null) {
               matchResult_3 = 0;
-              t1 = value(matchValue_5);
-              t2 = value(matchValue_6);
+              t1 = matchValue_5;
+              t2 = matchValue_6;
             } else {
               matchResult_3 = 1;
             }
@@ -313,12 +313,12 @@ class OntologyAnnotation {
     if (tan == null) {
       return void 0;
     } else {
-      const tan_1 = value(tan);
+      const tan_1 = tan;
       const matchValue = tryParseTermAnnotation(tan_1);
-      return matchValue == null ? tsr == null ? void 0 : value(tsr) === "" ? void 0 : (tsr_1 = value(tsr), {
+      return matchValue == null ? tsr == null ? void 0 : tsr === "" ? void 0 : (tsr_1 = tsr, {
         IDSpace: tsr_1,
         LocalID: tan_1
-      }) : value(matchValue);
+      }) : matchValue;
     }
   }
   Print() {

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,4 +1,4 @@
-import { defaultArg, unwrap, value } from '../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { defaultArg, unwrap } 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';
@@ -187,7 +187,7 @@ class Person {
     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)];
+        return [tupledArg[0], option_1];
       } else {
         return void 0;
       }

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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"}

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

@@ -12,10 +12,8 @@ import { Component_fromISAString_7C9A7CF8 } from './Component.js';
 
 function tryInt(str) {
   let matchValue;
-  let outArg = 0;
-  matchValue = [tryParse(str, 511, false, 32, new FSharpRef(() => outArg | 0, (v) => {
-    outArg = v | 0;
-  })), outArg];
+  const cell = new FSharpRef(0);
+  matchValue = [tryParse(str, 511, false, 32, cell), cell.contents];
   if (matchValue[0]) {
     return matchValue[1];
   } else {
@@ -29,7 +27,7 @@ function createOrderComment(index) {
 function tryGetIndex(comments) {
   const matchValue = tryItem(orderName, comments);
   if (matchValue != null) {
-    const ci = value(matchValue);
+    const ci = matchValue;
     const i = findIndex((c) => equals(c.Name, orderName), comments) | 0;
     comments.splice(i, 1);
     return tryInt(ci);
@@ -51,7 +49,7 @@ function tryGetOntologyAnnotationIndex(oa) {
 function tryGetParameterIndex(param) {
   const option_1 = param.ParameterName;
   if (option_1 != null) {
-    const oa = value(option_1);
+    const oa = option_1;
     return tryGetIndex(oa.Comments);
   } else {
     return void 0;
@@ -60,7 +58,7 @@ function tryGetParameterIndex(param) {
 function tryGetParameterColumnIndex(paramValue) {
   const option_1 = paramValue.Category;
   if (option_1 != null) {
-    return tryGetParameterIndex(value(option_1));
+    return tryGetParameterIndex(option_1);
   } else {
     return void 0;
   }
@@ -68,7 +66,7 @@ function tryGetParameterColumnIndex(paramValue) {
 function tryGetFactorIndex(factor) {
   const option_1 = factor.FactorType;
   if (option_1 != null) {
-    const oa = value(option_1);
+    const oa = option_1;
     return tryGetIndex(oa.Comments);
   } else {
     return void 0;
@@ -77,7 +75,7 @@ function tryGetFactorIndex(factor) {
 function tryGetFactorColumnIndex(factorValue) {
   const option_1 = factorValue.Category;
   if (option_1 != null) {
-    return tryGetFactorIndex(value(option_1));
+    return tryGetFactorIndex(option_1);
   } else {
     return void 0;
   }
@@ -85,7 +83,7 @@ function tryGetFactorColumnIndex(factorValue) {
 function tryGetCharacteristicIndex(characteristic) {
   const option_1 = characteristic.CharacteristicType;
   if (option_1 != null) {
-    const oa = value(option_1);
+    const oa = option_1;
     return tryGetIndex(oa.Comments);
   } else {
     return void 0;
@@ -94,7 +92,7 @@ function tryGetCharacteristicIndex(characteristic) {
 function tryGetCharacteristicColumnIndex(characteristicValue) {
   const option_1 = characteristicValue.Category;
   if (option_1 != null) {
-    return tryGetCharacteristicIndex(value(option_1));
+    return tryGetCharacteristicIndex(option_1);
   } else {
     return void 0;
   }
@@ -102,7 +100,7 @@ function tryGetCharacteristicColumnIndex(characteristicValue) {
 function tryGetComponentIndex(comp) {
   const option_1 = comp.ComponentType;
   if (option_1 != null) {
-    const oa = value(option_1);
+    const oa = option_1;
     return tryGetIndex(oa.Comments);
   } else {
     return void 0;

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

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

package/dist/ts/ts/Core/Process/Component.js

@@ -1,4 +1,4 @@
-import { value, unwrap, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { unwrap, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { OntologyAnnotation_$reflection, OntologyAnnotation } from '../OntologyAnnotation.js';
 import { ScalarValue_$reflection, ScalarValue, ScalarValue_Ontology, ScalarValue_Name } from '../ScalarValue.js';
 import { Record } from '../../../node_modules/@fable-org/fable-library-ts/Types.js';
@@ -46,7 +46,7 @@ function Component_$reflection() {
 function Component__get_ComponentName(this$) {
   const option_1 = this$.ComponentValue;
   if (option_1 != null) {
-    return Component_composeName(value(option_1), this$.ComponentUnit);
+    return Component_composeName(option_1, this$.ComponentUnit);
   } else {
     return void 0;
   }
@@ -60,35 +60,35 @@ function Component_create_Z7A4FC9(value, unit, componentType) {
 function Component_get_empty() {
   return Component_create_Z7A4FC9();
 }
-function Component_composeName(value$1, unit) {
-  if (value$1.tag === /* Ontology */
+function Component_composeName(value, unit) {
+  if (value.tag === /* Ontology */
   0) {
-    const oa = value$1.fields[0];
+    const oa = value.fields[0];
     return concat(oa.NameText, " (", oa.TermAccessionShort, ")");
   } else if (unit != null) {
-    const u = value(unit);
-    return `${value$1.Text} ${u.NameText} (${u.TermAccessionShort})`;
+    const u = unit;
+    return `${value.Text} ${u.NameText} (${u.TermAccessionShort})`;
   } else {
-    return value$1.Text;
+    return value.Text;
   }
 }
 function Component_decomposeName_Z721C83C5(name) {
   const activePatternResult = ActivePatterns_$007CRegex$007C_$007C("^(?<value>[\\d\\.]+) (?<unit>.+) \\((?<ontology>[^(]*:[^)]*)\\)", name);
   if (activePatternResult != null) {
-    const unitr = value(activePatternResult);
+    const unitr = activePatternResult;
     let oa;
     const tan = unitr.groups && unitr.groups.ontology || "";
     oa = OntologyAnnotation.fromTermAnnotation(tan);
     let v;
-    const value$1 = unitr.groups && unitr.groups.value || "";
-    v = ScalarValue.fromString(value$1);
+    const value = unitr.groups && unitr.groups.value || "";
+    v = ScalarValue.fromString(value);
     const u = unitr.groups && unitr.groups.unit || "";
     oa.Name = u;
     return [v, oa];
   } else {
     const activePatternResult_1 = ActivePatterns_$007CRegex$007C_$007C("^(?<value>[^\\(]+) \\((?<ontology>[^(]*:[^)]*)\\)", name);
     if (activePatternResult_1 != null) {
-      const r = value(activePatternResult_1);
+      const r = activePatternResult_1;
       let oa_1;
       const tan_1 = r.groups && r.groups.ontology || "";
       oa_1 = OntologyAnnotation.fromTermAnnotation(tan_1);
@@ -98,7 +98,7 @@ function Component_decomposeName_Z721C83C5(name) {
     } else {
       const activePatternResult_2 = ActivePatterns_$007CRegex$007C_$007C("^(?<value>[^\\(\\)]+) \\(\\)", name);
       if (activePatternResult_2 != null) {
-        const r_1 = value(activePatternResult_2);
+        const r_1 = activePatternResult_2;
         return [ScalarValue_Ontology(new OntologyAnnotation(r_1.groups && r_1.groups.value || "")), void 0];
       } else {
         return [ScalarValue_Name(name), void 0];
@@ -113,49 +113,49 @@ function Component_fromISAString_7C9A7CF8(name, term, source, accession, comment
   if (name == null) {
     return Component_make(void 0, void 0, cType);
   } else {
-    const patternInput = Component_decomposeName_Z721C83C5(value(name));
+    const patternInput = Component_decomposeName_Z721C83C5(name);
     return Component_make(Option_fromValueWithDefault(ScalarValue_Name(""), patternInput[0]), patternInput[1], cType);
   }
 }
 function Component_toStringObject_Z685B8F25(c) {
   let option_1 = void 0, oa = void 0;
   let oa_1;
-  const value$1 = {
+  const value = {
     TermAccessionNumber: "",
     TermName: "",
     TermSourceREF: ""
   };
-  oa_1 = defaultArg((option_1 = c.ComponentType, option_1 != null ? (oa = value(option_1), OntologyAnnotation.toStringObject(oa)) : void 0), value$1);
+  oa_1 = defaultArg((option_1 = c.ComponentType, option_1 != null ? (oa = option_1, OntologyAnnotation.toStringObject(oa)) : void 0), value);
   return [defaultArg(Component__get_ComponentName(c), ""), oa_1];
 }
 function Component__get_NameText(this$) {
   let option_1 = void 0, c = void 0;
-  return defaultArg((option_1 = this$.ComponentType, option_1 != null ? (c = value(option_1), c.NameText) : void 0), "");
+  return defaultArg((option_1 = this$.ComponentType, option_1 != null ? (c = option_1, c.NameText) : void 0), "");
 }
 function Component__get_UnitText(this$) {
   let option_1 = void 0, c = void 0;
-  return defaultArg((option_1 = this$.ComponentUnit, option_1 != null ? (c = value(option_1), c.NameText) : void 0), "");
+  return defaultArg((option_1 = this$.ComponentUnit, option_1 != null ? (c = option_1, c.NameText) : void 0), "");
 }
 function Component__get_ValueText(this$) {
   let option_1 = void 0, c = void 0;
-  return defaultArg((option_1 = this$.ComponentValue, option_1 != null ? (c = value(option_1), c.Text) : void 0), "");
+  return defaultArg((option_1 = this$.ComponentValue, option_1 != null ? (c = option_1, c.Text) : void 0), "");
 }
 function Component__get_ValueWithUnitText(this$) {
   let oa = void 0;
   let unit;
   const option_1 = this$.ComponentUnit;
-  unit = option_1 != null ? (oa = value(option_1), oa.NameText) : void 0;
+  unit = option_1 != null ? (oa = option_1, oa.NameText) : void 0;
   const v = Component__get_ValueText(this$);
   if (unit == null) {
     return v;
   } else {
-    const u = value(unit);
+    const u = unit;
     return toText(printf("%s %s"))(v)(u);
   }
 }
 function Component__MapCategory_658CFBF6(this$, f) {
   let option = void 0;
-  return new Component(this$.ComponentValue, this$.ComponentUnit, (option = this$.ComponentType, option != null ? f(value(option)) : void 0));
+  return new Component(this$.ComponentValue, this$.ComponentUnit, (option = this$.ComponentType, option != null ? f(option) : void 0));
 }
 function Component__SetCategory_ZDED3A0F(this$, c) {
   return new Component(this$.ComponentValue, this$.ComponentUnit, c);

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

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

package/dist/ts/ts/Core/Process/Factor.js

@@ -1,4 +1,4 @@
-import { unwrap, defaultArg, value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { unwrap, defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { OntologyAnnotation, OntologyAnnotation_$reflection } from '../OntologyAnnotation.js';
 import { Comment$_$reflection } from '../Comment.js';
 import { Option_fromValueWithDefault, ResizeArray_map } from '../Helper/Collections.js';
@@ -37,12 +37,12 @@ class Factor extends Record {
    */
   static toStringObject(factor) {
     let option_1 = void 0, oa = void 0;
-    const value$1 = {
+    const value = {
       TermAccessionNumber: "",
       TermName: "",
       TermSourceREF: ""
     };
-    return defaultArg((option_1 = factor.FactorType, option_1 != null ? (oa = value(option_1), OntologyAnnotation.toStringObject(oa)) : void 0), value$1);
+    return defaultArg((option_1 = factor.FactorType, option_1 != null ? (oa = option_1, OntologyAnnotation.toStringObject(oa)) : void 0), value);
   }
   get NameText() {
     const this$ = this;
@@ -51,7 +51,7 @@ class Factor extends Record {
   MapCategory(f) {
     let option = void 0;
     const this$ = this;
-    return new Factor(this$.Name, (option = this$.FactorType, option != null ? f(value(option)) : void 0), this$.Comments);
+    return new Factor(this$.Name, (option = this$.FactorType, option != null ? f(option) : void 0), this$.Comments);
   }
   SetCategory(c) {
     const this$ = this;
@@ -92,7 +92,7 @@ class Factor extends Record {
    */
   static mapComments(f, factor) {
     let option = void 0;
-    return new Factor(factor.Name, factor.FactorType, (option = factor.Comments, option != null ? f(value(option)) : void 0));
+    return new Factor(factor.Name, factor.FactorType, (option = factor.Comments, option != null ? f(option) : void 0));
   }
   /**
    * Replaces comments of a factor by given comment list
@@ -111,7 +111,7 @@ class Factor extends Record {
    */
   static mapFactorType(f, factor) {
     let option = void 0;
-    return new Factor(factor.Name, (option = factor.FactorType, option != null ? f(value(option)) : void 0), factor.Comments);
+    return new Factor(factor.Name, (option = factor.FactorType, option != null ? f(option) : void 0), factor.Comments);
   }
   /**
    * Replaces factor type of a factor by given factor type
@@ -141,7 +141,7 @@ class Factor extends Record {
     const this$ = this;
     let comments;
     const option_1 = this$.Comments;
-    comments = option_1 != null ? ResizeArray_map((c) => c.Copy(), value(option_1)) : void 0;
+    comments = option_1 != null ? ResizeArray_map((c) => c.Copy(), option_1) : void 0;
     return Factor.make(this$.Name, this$.FactorType, comments);
   }
   Print() {

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

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

package/dist/ts/ts/Core/Process/FactorValue.js

@@ -1,5 +1,5 @@
 import { Record, toString } from '../../../node_modules/@fable-org/fable-library-ts/Types.js';
-import { value, defaultArg, unwrap } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { defaultArg, unwrap } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { Factor_$reflection, Factor } from './Factor.js';
 import { OntologyAnnotation_$reflection } from '../OntologyAnnotation.js';
 import { ScalarValue_$reflection } from '../ScalarValue.js';
@@ -24,14 +24,14 @@ class FactorValue extends Record {
     const this$ = this;
     let category;
     const option_1 = this$.Category;
-    category = option_1 != null ? (f = value(option_1), f.NameText) : void 0;
+    category = option_1 != null ? (f = option_1, f.NameText) : void 0;
     let unit;
     const option_3 = this$.Unit;
-    unit = option_3 != null ? (oa = value(option_3), oa.NameText) : void 0;
-    let value$1;
+    unit = option_3 != null ? (oa = option_3, oa.NameText) : void 0;
+    let value;
     const option_5 = this$.Value;
-    value$1 = option_5 != null ? (v = value(option_5), s = v.PrintCompact(), unit == null ? s : s + " " + value(unit)) : void 0;
-    return category == null ? value$1 == null ? "" : (value_2 = value(value$1), value_2) : value$1 == null ? (category_2 = value(category), category_2 + ":No Value") : (category_1 = value(category), value_1 = value(value$1), category_1 + ":" + value_1);
+    value = option_5 != null ? (v = option_5, s = v.PrintCompact(), unit == null ? s : s + " " + unit) : void 0;
+    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);
   }
   AlternateName() {
     return void 0;
@@ -45,7 +45,7 @@ class FactorValue extends Record {
   GetCategory() {
     const this$ = this;
     const option_1 = this$.Category;
-    return option_1 != null ? value(option_1).FactorType : void 0;
+    return option_1 != null ? option_1.FactorType : void 0;
   }
   GetValue() {
     const this$ = this;
@@ -73,7 +73,7 @@ function FactorValue_get_empty() {
 }
 function FactorValue__get_ValueText(this$) {
   let option_1 = void 0, oa = void 0, f = void 0, oa_1 = void 0;
-  return defaultArg((option_1 = this$.Value, option_1 != null ? (oa = value(option_1), oa.tag === /* Float */
+  return defaultArg((option_1 = this$.Value, option_1 != null ? (oa = option_1, oa.tag === /* Float */
   2 ? (f = oa.fields[0], f.toString()) : oa.tag === /* Int */
   1 ? int32ToString(oa.fields[0]) : oa.tag === /* Name */
   3 ? oa.fields[0] : (oa_1 = oa.fields[0], oa_1.NameText)) : void 0), "");
@@ -82,26 +82,26 @@ function FactorValue__get_ValueWithUnitText(this$) {
   let oa = void 0;
   let unit;
   const option_1 = this$.Unit;
-  unit = option_1 != null ? (oa = value(option_1), oa.NameText) : void 0;
+  unit = option_1 != null ? (oa = option_1, oa.NameText) : void 0;
   const v = FactorValue__get_ValueText(this$);
   if (unit == null) {
     return v;
   } else {
-    const u = value(unit);
+    const u = unit;
     return toText(printf("%s %s"))(v)(u);
   }
 }
 function FactorValue__get_NameText(this$) {
   let option_1 = void 0, factor = void 0;
-  return defaultArg((option_1 = this$.Category, option_1 != null ? (factor = value(option_1), factor.NameText) : void 0), "");
+  return defaultArg((option_1 = this$.Category, option_1 != null ? (factor = option_1, factor.NameText) : void 0), "");
 }
 function FactorValue__MapCategory_658CFBF6(this$, f) {
   let option_1 = void 0, p = void 0;
-  return new FactorValue(this$.ID, (option_1 = this$.Category, option_1 != null ? (p = value(option_1), p.MapCategory(f)) : void 0), this$.Value, this$.Unit);
+  return new FactorValue(this$.ID, (option_1 = this$.Category, option_1 != null ? (p = option_1, p.MapCategory(f)) : void 0), this$.Value, this$.Unit);
 }
 function FactorValue__SetCategory_ZDED3A0F(this$, c) {
   let matchValue = void 0, p = void 0;
-  return new FactorValue(this$.ID, (matchValue = this$.Category, matchValue == null ? Factor.create(void 0, c) : (p = value(matchValue), p.SetCategory(c))), this$.Value, this$.Unit);
+  return new FactorValue(this$.ID, (matchValue = this$.Category, matchValue == null ? Factor.create(void 0, c) : (p = matchValue, p.SetCategory(c))), this$.Value, this$.Unit);
 }
 function FactorValue_getNameAsString_7105C732(fv) {
   return FactorValue__get_NameText(fv);
@@ -109,9 +109,9 @@ function FactorValue_getNameAsString_7105C732(fv) {
 function FactorValue_nameEqualsString(name, fv) {
   return FactorValue__get_NameText(fv) === name;
 }
-function FactorValue_createAsPV(alternateName, measurementMethod, description, category, value$1, unit) {
+function FactorValue_createAsPV(alternateName, measurementMethod, description, category, value, unit) {
   let option_1 = void 0, c = void 0;
-  return FactorValue_create_6E061C87(void 0, unwrap((option_1 = category, option_1 != null ? (c = value(option_1), Factor.create(void 0, c)) : void 0)), unwrap(value$1), unwrap(unit));
+  return FactorValue_create_6E061C87(void 0, unwrap((option_1 = category, option_1 != null ? (c = option_1, Factor.create(void 0, c)) : void 0)), unwrap(value), unwrap(unit));
 }
 
 export { FactorValue, FactorValue_$reflection, FactorValue__MapCategory_658CFBF6, FactorValue__SetCategory_ZDED3A0F, FactorValue__get_NameText, FactorValue__get_ValueText, FactorValue__get_ValueWithUnitText, FactorValue_createAsPV, FactorValue_create_6E061C87, FactorValue_getNameAsString_7105C732, FactorValue_get_empty, FactorValue_make, FactorValue_nameEqualsString };

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

@@ -1 +1 @@
-{"version":3,"file":"Material.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Core/Process/Material.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAY,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAU,UAAU,EAAiB,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAoB,MAAM,EAAc,MAAM,uCAAuC,CAAC;AAC7F,OAAO,EAAsC,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAEzG,OAAO,EAAwD,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE9G,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAoD,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AACvH,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,qBAAa,QAAS,SAAQ,MAAO,YAAW,UAAU,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,aAAa;IACtG,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACnD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACrE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACvC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAQvM,KAAK,IAAI,MAAM;IAIf,YAAY,IAAI,MAAM;CAezB;AAED,wBAAgB,oBAAoB,IAAI,QAAQ,CAE/C;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAEnO;AAED,wBAAgB,yBAAyB,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,mBAAmB,EAAE,eAAe,CAAC,EAAE,UAAU,CAAC,sBAAsB,CAAC,EAAE,WAAW,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAE5M;AAED,wBAAgB,kBAAkB,IAAI,QAAQ,CAE7C;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAE9D;AAED,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAEtF;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAElH"}
+{"version":3,"file":"Material.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Core/Process/Material.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAY,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAU,UAAU,EAAiB,MAAM,qCAAqC,CAAC;AACxF,OAAO,EAAE,MAAM,EAAc,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAsC,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAEzG,OAAO,EAAwD,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE9G,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAoD,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AACvH,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,qBAAa,QAAS,SAAQ,MAAO,YAAW,UAAU,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,aAAa;IACtG,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACnD,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACrE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACvC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAQvM,KAAK,IAAI,MAAM;IAIf,YAAY,IAAI,MAAM;CAezB;AAED,wBAAgB,oBAAoB,IAAI,QAAQ,CAE/C;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAEnO;AAED,wBAAgB,yBAAyB,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,mBAAmB,EAAE,eAAe,CAAC,EAAE,UAAU,CAAC,sBAAsB,CAAC,EAAE,WAAW,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAE5M;AAED,wBAAgB,kBAAkB,IAAI,QAAQ,CAE7C;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAE9D;AAED,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAEtF;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAElH"}

package/dist/ts/ts/Core/Process/Material.js

@@ -1,6 +1,6 @@
 import { Record, toString } from '../../../node_modules/@fable-org/fable-library-ts/Types.js';
 import { length, empty, choose } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
-import { defaultArg, value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
+import { defaultArg } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { MaterialAttributeValue_$reflection } from './MaterialAttributeValue.js';
 import { MaterialType__get_AsString, MaterialType_$reflection } from './MaterialType.js';
 import { toText, printf } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
@@ -27,7 +27,7 @@ class Material extends Record {
       const arg_3 = Material__get_NameText(this$);
       return toText(printf("%s [%i characteristics]"))(arg_3)(chars);
     } else {
-      const t = value(matchValue);
+      const t = matchValue;
       const arg = Material__get_NameText(this$);
       const arg_1 = MaterialType__get_AsString(t);
       return toText(printf("%s [%s; %i characteristics]"))(arg)(arg_1)(chars);