@nfdi4plants/arctrl 3.1.1 → 3.2.0

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

@@ -1,11 +1,11 @@
-import { unwrap, defaultArg, map } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
+import { unwrap, defaultArg, value } 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';
-import { tryFind, exists, append, singleton, filter } from '../../../node_modules/@fable-org/fable-library-js/List.js';
-import { equals } from '../../../node_modules/@fable-org/fable-library-js/Util.js';
-import { Record, toString } from '../../../node_modules/@fable-org/fable-library-js/Types.js';
-import { record_type, option_type, string_type, array_type } from '../../../node_modules/@fable-org/fable-library-js/Reflection.js';
+import { tryFind, exists, append, singleton, filter } from '../../../node_modules/@fable-org/fable-library-ts/List.js';
+import { equals } from '../../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { Record, toString } from '../../../node_modules/@fable-org/fable-library-ts/Types.js';
+import { record_type, option_type, string_type, array_type } from '../../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 
 class Factor extends Record {
   constructor(Name, FactorType, Comments) {
@@ -23,74 +23,125 @@ class Factor extends Record {
   static get empty() {
     return Factor.create();
   }
+  /**
+   * Create a ISAJson Factor from ISATab string entries
+   */
   static fromString(name, term, source, accession, comments) {
     const oa = OntologyAnnotation.create(term, source, accession, unwrap(comments));
     const name_1 = Option_fromValueWithDefault("", name);
     const factorType = Option_fromValueWithDefault(new OntologyAnnotation(), oa);
     return Factor.make(name_1, factorType, void 0);
   }
+  /**
+   * Get ISATab string entries from an ISAJson Factor object
+   */
   static toStringObject(factor) {
-    const value = {
+    let option_1 = void 0, oa = void 0;
+    const value$1 = {
       TermAccessionNumber: "",
       TermName: "",
       TermSourceREF: ""
     };
-    return defaultArg(map((oa) => OntologyAnnotation.toStringObject(oa), factor.FactorType), value);
+    return defaultArg((option_1 = factor.FactorType, option_1 != null ? (oa = value(option_1), OntologyAnnotation.toStringObject(oa)) : void 0), value$1);
   }
   get NameText() {
     const this$ = this;
     return defaultArg(this$.Name, "");
   }
   MapCategory(f) {
+    let option = void 0;
     const this$ = this;
-    return new Factor(this$.Name, map(f, this$.FactorType), this$.Comments);
+    return new Factor(this$.Name, (option = this$.FactorType, option != null ? f(value(option)) : void 0), this$.Comments);
   }
   SetCategory(c) {
     const this$ = this;
     return new Factor(this$.Name, c, this$.Comments);
   }
+  /**
+   * If a factor with the given name exists in the list, returns it
+   */
   static tryGetByName(name, factors) {
     return tryFind((f) => equals(f.Name, name), factors);
   }
+  /**
+   * If a factor with the given name exists in the list exists, returns true
+   */
   static existsByName(name, factors) {
     return exists((f) => equals(f.Name, name), factors);
   }
+  /**
+   * adds the given factor to the factors
+   */
   static add(factors, factor) {
     return append(factors, singleton(factor));
   }
+  /**
+   * If a factor with the given name exists in the list, removes it
+   */
   static removeByName(name, factors) {
     return filter((f) => !equals(f.Name, name), factors);
   }
+  /**
+   * Returns comments of a factor
+   */
   static getComments(factor) {
     return factor.Comments;
   }
+  /**
+   * Applies function f on comments of a factor
+   */
   static mapComments(f, factor) {
-    return new Factor(factor.Name, factor.FactorType, map(f, factor.Comments));
+    let option = void 0;
+    return new Factor(factor.Name, factor.FactorType, (option = factor.Comments, option != null ? f(value(option)) : void 0));
   }
+  /**
+   * Replaces comments of a factor by given comment list
+   */
   static setComments(factor, comments) {
     return new Factor(factor.Name, factor.FactorType, comments);
   }
+  /**
+   * Returns factor type of a factor
+   */
   static getFactorType(factor) {
     return factor.FactorType;
   }
+  /**
+   * Applies function f on factor type of a factor
+   */
   static mapFactorType(f, factor) {
-    return new Factor(factor.Name, map(f, factor.FactorType), factor.Comments);
+    let option = void 0;
+    return new Factor(factor.Name, (option = factor.FactorType, option != null ? f(value(option)) : void 0), factor.Comments);
   }
+  /**
+   * Replaces factor type of a factor by given factor type
+   */
   static setFactorType(factor, factorType) {
     return new Factor(factor.Name, factorType, factor.Comments);
   }
+  /**
+   * Returns the name of the factor as string if it exists
+   */
   static tryGetName(f) {
     return f.Name;
   }
+  /**
+   * Returns the name of the factor as string
+   */
   static getNameAsString(f) {
     return f.NameText;
   }
+  /**
+   * Returns true if the given name matches the name of the factor
+   */
   static nameEqualsString(name, f) {
     return f.NameText === name;
   }
   Copy() {
     const this$ = this;
-    const comments = map((a) => ResizeArray_map((c) => c.Copy(), a), this$.Comments);
+    let comments;
+    const option_1 = this$.Comments;
+    comments = option_1 != null ? ResizeArray_map((c) => c.Copy(), value(option_1)) : void 0;
     return Factor.make(this$.Name, this$.FactorType, comments);
   }
   Print() {

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

@@ -1,31 +1,31 @@
-import { Record } from '@fable-org/fable-library-js/Types.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { Factor } from './Factor.js';
-import { OntologyAnnotation } from '../OntologyAnnotation.js';
-import { IISAPrintable } from '../Helper/Printer.js';
-import { Value_$union } from '../Value.js';
-import { IEquatable } from '@fable-org/fable-library-js/Util.js';
-import { IPropertyValue } from '../IPropertyValue.js';
-import { TypeInfo } from '@fable-org/fable-library-js/Reflection.js';
+import { Record } from '@fable-org/fable-library-ts/Types.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { Factor } from './Factor.ts';
+import { OntologyAnnotation } from '../OntologyAnnotation.ts';
+import { ScalarValue_$union } from '../ScalarValue.ts';
+import { IISAPrintable } from '../Helper/Printer.ts';
+import { IEquatable } from '@fable-org/fable-library-ts/Util.ts';
+import { IPropertyValue } from '../IPropertyValue.ts';
+import { TypeInfo } from '@fable-org/fable-library-ts/Reflection.ts';
 export declare class FactorValue extends Record implements IEquatable<FactorValue>, IPropertyValue, IISAPrintable {
     readonly ID: Option<string>;
     readonly Category: Option<Factor>;
-    readonly Value: Option<Value_$union>;
+    readonly Value: Option<ScalarValue_$union>;
     readonly Unit: Option<OntologyAnnotation>;
-    constructor(ID: Option<string>, Category: Option<Factor>, Value: Option<Value_$union>, Unit: Option<OntologyAnnotation>);
+    constructor(ID: Option<string>, Category: Option<Factor>, Value: Option<ScalarValue_$union>, Unit: Option<OntologyAnnotation>);
     Print(): string;
     PrintCompact(): string;
     AlternateName(): Option<string>;
     MeasurementMethod(): Option<string>;
     Description(): Option<string>;
     GetCategory(): Option<OntologyAnnotation>;
-    GetValue(): Option<Value_$union>;
+    GetValue(): Option<ScalarValue_$union>;
     GetUnit(): Option<OntologyAnnotation>;
     GetAdditionalType(): string;
 }
 export declare function FactorValue_$reflection(): TypeInfo;
-export declare function FactorValue_make(id: Option<string>, category: Option<Factor>, value: Option<Value_$union>, unit: Option<OntologyAnnotation>): FactorValue;
-export declare function FactorValue_create_30BDC49(Id?: string, Category?: Factor, Value?: Value_$union, Unit?: OntologyAnnotation): FactorValue;
+export declare function FactorValue_make(id: Option<string>, category: Option<Factor>, value: Option<ScalarValue_$union>, unit: Option<OntologyAnnotation>): FactorValue;
+export declare function FactorValue_create_6E061C87(Id?: string, Category?: Factor, Value?: ScalarValue_$union, Unit?: OntologyAnnotation): FactorValue;
 export declare function FactorValue_get_empty(): FactorValue;
 export declare function FactorValue__get_ValueText(this$: FactorValue): string;
 export declare function FactorValue__get_ValueWithUnitText(this$: FactorValue): string;
@@ -40,5 +40,5 @@ export declare function FactorValue_getNameAsString_7105C732(fv: FactorValue): s
  * Returns true if the given name matches the name of the factor value
  */
 export declare function FactorValue_nameEqualsString(name: string, fv: FactorValue): boolean;
-export declare function FactorValue_createAsPV(alternateName: Option<string>, measurementMethod: Option<string>, description: Option<string>, category: Option<OntologyAnnotation>, value: Option<Value_$union>, unit: Option<OntologyAnnotation>): FactorValue;
+export declare function FactorValue_createAsPV(alternateName: Option<string>, measurementMethod: Option<string>, description: Option<string>, category: Option<OntologyAnnotation>, value: Option<ScalarValue_$union>, unit: Option<OntologyAnnotation>): FactorValue;
 //# sourceMappingURL=FactorValue.d.ts.map

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,11 +1,11 @@
-import { Record, toString } from '../../../node_modules/@fable-org/fable-library-js/Types.js';
-import { map, value, bind, defaultArg, unwrap } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
+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 { Factor_$reflection, Factor } from './Factor.js';
 import { OntologyAnnotation_$reflection } from '../OntologyAnnotation.js';
-import { Value_$reflection } from '../Value.js';
-import { int32ToString } from '../../../node_modules/@fable-org/fable-library-js/Util.js';
-import { record_type, option_type, string_type } from '../../../node_modules/@fable-org/fable-library-js/Reflection.js';
-import { toText, printf } from '../../../node_modules/@fable-org/fable-library-js/String.js';
+import { ScalarValue_$reflection } from '../ScalarValue.js';
+import { int32ToString } from '../../../node_modules/@fable-org/fable-library-ts/Util.js';
+import { record_type, option_type, string_type } from '../../../node_modules/@fable-org/fable-library-ts/Reflection.js';
+import { toText, printf } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
 
 class FactorValue extends Record {
   constructor(ID, Category, Value, Unit) {
@@ -20,18 +20,17 @@ class FactorValue extends Record {
     return toString(this$);
   }
   PrintCompact() {
-    let value_2, category_2, category_1, value_1;
+    let f = void 0, oa = void 0, v = void 0, s = void 0, value_2 = void 0, category_2 = void 0, category_1 = void 0, value_1 = void 0;
     const this$ = this;
-    const category = map((f) => f.NameText, this$.Category);
-    const unit = map((oa) => oa.NameText, this$.Unit);
-    const value$1 = map((v) => {
-      const s = v.PrintCompact();
-      if (unit == null) {
-        return s;
-      } else {
-        return s + " " + value(unit);
-      }
-    }, this$.Value);
+    let category;
+    const option_1 = this$.Category;
+    category = option_1 != null ? (f = value(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;
+    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);
   }
   AlternateName() {
@@ -45,7 +44,8 @@ class FactorValue extends Record {
   }
   GetCategory() {
     const this$ = this;
-    return bind((f) => f.FactorType, this$.Category);
+    const option_1 = this$.Category;
+    return option_1 != null ? value(option_1).FactorType : void 0;
   }
   GetValue() {
     const this$ = this;
@@ -60,40 +60,29 @@ class FactorValue extends Record {
   }
 }
 function FactorValue_$reflection() {
-  return record_type("ARCtrl.Process.FactorValue", [], FactorValue, () => [["ID", option_type(string_type)], ["Category", option_type(Factor_$reflection())], ["Value", option_type(Value_$reflection())], ["Unit", option_type(OntologyAnnotation_$reflection())]]);
+  return record_type("ARCtrl.Process.FactorValue", [], FactorValue, () => [["ID", option_type(string_type)], ["Category", option_type(Factor_$reflection())], ["Value", option_type(ScalarValue_$reflection())], ["Unit", option_type(OntologyAnnotation_$reflection())]]);
 }
 function FactorValue_make(id, category, value, unit) {
   return new FactorValue(id, category, value, unit);
 }
-function FactorValue_create_30BDC49(Id, Category, Value, Unit) {
+function FactorValue_create_6E061C87(Id, Category, Value, Unit) {
   return FactorValue_make(Id, Category, Value, Unit);
 }
 function FactorValue_get_empty() {
-  return FactorValue_create_30BDC49();
+  return FactorValue_create_6E061C87();
 }
 function FactorValue__get_ValueText(this$) {
-  return defaultArg(map((oa) => {
-    switch (oa.tag) {
-      case /* Float */
-      2: {
-        const f = oa.fields[0];
-        return f.toString();
-      }
-      case /* Int */
-      1:
-        return int32ToString(oa.fields[0]);
-      case /* Name */
-      3:
-        return oa.fields[0];
-      default: {
-        const oa_1 = oa.fields[0];
-        return oa_1.NameText;
-      }
-    }
-  }, this$.Value), "");
+  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 */
+  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), "");
 }
 function FactorValue__get_ValueWithUnitText(this$) {
-  const unit = map((oa) => oa.NameText, this$.Unit);
+  let oa = void 0;
+  let unit;
+  const option_1 = this$.Unit;
+  unit = option_1 != null ? (oa = value(option_1), oa.NameText) : void 0;
   const v = FactorValue__get_ValueText(this$);
   if (unit == null) {
     return v;
@@ -103,13 +92,15 @@ function FactorValue__get_ValueWithUnitText(this$) {
   }
 }
 function FactorValue__get_NameText(this$) {
-  return defaultArg(map((factor) => factor.NameText, this$.Category), "");
+  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), "");
 }
 function FactorValue__MapCategory_658CFBF6(this$, f) {
-  return new FactorValue(this$.ID, map((p) => p.MapCategory(f), this$.Category), this$.Value, this$.Unit);
+  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);
 }
 function FactorValue__SetCategory_ZDED3A0F(this$, c) {
-  let matchValue, p;
+  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);
 }
 function FactorValue_getNameAsString_7105C732(fv) {
@@ -118,8 +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, unit) {
-  return FactorValue_create_30BDC49(void 0, unwrap(map((c) => Factor.create(void 0, c), category)), unwrap(value), unwrap(unit));
+function FactorValue_createAsPV(alternateName, measurementMethod, description, category, value$1, 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));
 }
 
-export { FactorValue, FactorValue_$reflection, FactorValue__MapCategory_658CFBF6, FactorValue__SetCategory_ZDED3A0F, FactorValue__get_NameText, FactorValue__get_ValueText, FactorValue__get_ValueWithUnitText, FactorValue_createAsPV, FactorValue_create_30BDC49, FactorValue_getNameAsString_7105C732, FactorValue_get_empty, FactorValue_make, FactorValue_nameEqualsString };
+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

@@ -1,12 +1,12 @@
-import { Record } from '@fable-org/fable-library-js/Types.js';
-import { FSharpList } from '@fable-org/fable-library-js/List.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { MaterialAttributeValue } from './MaterialAttributeValue.js';
-import { MaterialType_$union } from './MaterialType.js';
-import { IComparable, IEquatable } from '@fable-org/fable-library-js/Util.js';
-import { IISAPrintable } from '../Helper/Printer.js';
-import { TypeInfo } from '@fable-org/fable-library-js/Reflection.js';
-import { OntologyAnnotation } from '../OntologyAnnotation.js';
+import { Record } from '@fable-org/fable-library-ts/Types.ts';
+import { FSharpList } from '@fable-org/fable-library-ts/List.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { MaterialAttributeValue } from './MaterialAttributeValue.ts';
+import { MaterialType_$union } from './MaterialType.ts';
+import { IComparable, IEquatable } from '@fable-org/fable-library-ts/Util.ts';
+import { IISAPrintable } from '../Helper/Printer.ts';
+import { TypeInfo } from '@fable-org/fable-library-ts/Reflection.ts';
+import { OntologyAnnotation } from '../OntologyAnnotation.ts';
 export declare class Material extends Record implements IEquatable<Material>, IComparable<Material>, IISAPrintable {
     readonly ID: Option<string>;
     readonly Name: Option<string>;

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":"AAAA,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,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"}

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

@@ -1,10 +1,10 @@
-import { Record, toString } from '../../../node_modules/@fable-org/fable-library-js/Types.js';
-import { length, empty, choose } from '../../../node_modules/@fable-org/fable-library-js/List.js';
-import { defaultArg, value } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
+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 { MaterialAttributeValue_$reflection } from './MaterialAttributeValue.js';
 import { MaterialType__get_AsString, MaterialType_$reflection } from './MaterialType.js';
-import { toText, printf } from '../../../node_modules/@fable-org/fable-library-js/String.js';
-import { record_type, option_type, string_type, list_type } from '../../../node_modules/@fable-org/fable-library-js/Reflection.js';
+import { toText, printf } from '../../../node_modules/@fable-org/fable-library-ts/String.js';
+import { record_type, option_type, string_type, list_type } from '../../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 
 class Material extends Record {
   constructor(ID, Name, MaterialType, Characteristics, DerivesFrom) {

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

@@ -1,10 +1,10 @@
-import { Record } from '@fable-org/fable-library-js/Types.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { OntologyAnnotation } from '../OntologyAnnotation.js';
-import { IComparable, IEquatable } from '@fable-org/fable-library-js/Util.js';
-import { IISAPrintable } from '../Helper/Printer.js';
-import { TypeInfo } from '@fable-org/fable-library-js/Reflection.js';
-import { Comment$ } from '../Comment.js';
+import { Record } from '@fable-org/fable-library-ts/Types.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { OntologyAnnotation } from '../OntologyAnnotation.ts';
+import { IComparable, IEquatable } from '@fable-org/fable-library-ts/Util.ts';
+import { IISAPrintable } from '../Helper/Printer.ts';
+import { TypeInfo } from '@fable-org/fable-library-ts/Reflection.ts';
+import { Comment$ } from '../Comment.ts';
 export declare class MaterialAttribute extends Record implements IEquatable<MaterialAttribute>, IComparable<MaterialAttribute>, IISAPrintable {
     readonly ID: Option<string>;
     readonly CharacteristicType: Option<OntologyAnnotation>;

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

@@ -1 +1 @@
-{"version":3,"file":"MaterialAttribute.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Core/Process/MaterialAttribute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAY,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAiC,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC9F,OAAO,EAAkC,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAyC,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE5G,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,qBAAa,iBAAkB,SAAQ,MAAO,YAAW,UAAU,CAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,iBAAiB,CAAC,EAAE,aAAa;IACjI,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC;gBAC5C,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC;IAK9E,KAAK,IAAI,MAAM;IAIf,YAAY,IAAI,MAAM;CAIzB;AAED,wBAAgB,6BAA6B,IAAI,QAAQ,CAExD;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC,GAAG,iBAAiB,CAE5H;AAED,wBAAgB,gCAAgC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,iBAAiB,CAExH;AAED,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED;;GAEG;AACH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAG/I;AAED;;GAEG;AACH,wBAAgB,0CAA0C,CAAC,EAAE,EAAE,iBAAiB,GAAG;IAAE,mBAAmB,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAO1J;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAEhF;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,CAE3F;AAED,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,kBAAkB,KAAK,kBAAkB,CAAC,GAAG,iBAAiB,CAE1J;AAED,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,EAAE,kBAAkB,GAAG,iBAAiB,CAE1H;AAED;;GAEG;AACH,wBAAgB,0CAA0C,CAAC,EAAE,EAAE,iBAAiB,GAAG,MAAM,CAExF;AAED;;GAEG;AACH,wBAAgB,uCAAuC,CAAC,EAAE,EAAE,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,CAE7F;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,iBAAiB,GAAG,OAAO,CAE/F"}
+{"version":3,"file":"MaterialAttribute.d.ts","sourceRoot":"","sources":["../../../../../src/ARCtrl/ts/Core/Process/MaterialAttribute.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAY,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAwC,MAAM,EAAE,MAAM,uCAAuC,CAAC;AACrG,OAAO,EAAkC,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAyC,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE5G,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,qBAAa,iBAAkB,SAAQ,MAAO,YAAW,UAAU,CAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,iBAAiB,CAAC,EAAE,aAAa;IACjI,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC;gBAC5C,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC;IAK9E,KAAK,IAAI,MAAM;IAIf,YAAY,IAAI,MAAM;CAIzB;AAED,wBAAgB,6BAA6B,IAAI,QAAQ,CAExD;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC,GAAG,iBAAiB,CAE5H;AAED,wBAAgB,gCAAgC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,iBAAiB,CAExH;AAED,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED;;GAEG;AACH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAG/I;AAED;;GAEG;AACH,wBAAgB,0CAA0C,CAAC,EAAE,EAAE,iBAAiB,GAAG;IAAE,mBAAmB,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAQ1J;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAGhF;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,CAS3F;AAED,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,kBAAkB,KAAK,kBAAkB,CAAC,GAAG,iBAAiB,CAG1J;AAED,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,EAAE,kBAAkB,GAAG,iBAAiB,CAE1H;AAED;;GAEG;AACH,wBAAgB,0CAA0C,CAAC,EAAE,EAAE,iBAAiB,GAAG,MAAM,CAExF;AAED;;GAEG;AACH,wBAAgB,uCAAuC,CAAC,EAAE,EAAE,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,CAE7F;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,iBAAiB,GAAG,OAAO,CAE/F"}

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

@@ -1,7 +1,7 @@
-import { Record, toString } from '../../../node_modules/@fable-org/fable-library-js/Types.js';
-import { unwrap, defaultArg, map, bind } from '../../../node_modules/@fable-org/fable-library-js/Option.js';
+import { Record, toString } from '../../../node_modules/@fable-org/fable-library-ts/Types.js';
+import { unwrap, defaultArg, value } from '../../../node_modules/@fable-org/fable-library-ts/Option.js';
 import { OntologyAnnotation_$reflection, OntologyAnnotation } from '../OntologyAnnotation.js';
-import { record_type, option_type, string_type } from '../../../node_modules/@fable-org/fable-library-js/Reflection.js';
+import { record_type, option_type, string_type } from '../../../node_modules/@fable-org/fable-library-ts/Reflection.js';
 import { Option_fromValueWithDefault } from '../Helper/Collections.js';
 
 class MaterialAttribute extends Record {
@@ -36,21 +36,30 @@ function MaterialAttribute_fromString_5980DC03(term, source, accession, comments
   return MaterialAttribute_make(void 0, Option_fromValueWithDefault(new OntologyAnnotation(), oa));
 }
 function MaterialAttribute_toStringObject_Z1E3B85DD(ma) {
-  const value = {
+  let option_1 = void 0, oa = void 0;
+  const value$1 = {
     TermAccessionNumber: "",
     TermName: "",
     TermSourceREF: ""
   };
-  return defaultArg(map((oa) => OntologyAnnotation.toStringObject(oa), ma.CharacteristicType), value);
+  return defaultArg((option_1 = ma.CharacteristicType, option_1 != null ? (oa = value(option_1), OntologyAnnotation.toStringObject(oa)) : void 0), value$1);
 }
 function MaterialAttribute__get_NameText(this$) {
-  return defaultArg(map((oa) => oa.NameText, this$.CharacteristicType), "");
+  let option_1 = void 0, oa = void 0;
+  return defaultArg((option_1 = this$.CharacteristicType, option_1 != null ? (oa = value(option_1), oa.NameText) : void 0), "");
 }
 function MaterialAttribute__get_TryNameText(this$) {
-  return bind((oa) => oa.Name, this$.CharacteristicType);
+  const option_1 = this$.CharacteristicType;
+  if (option_1 != null) {
+    const oa = value(option_1);
+    return oa.Name;
+  } else {
+    return void 0;
+  }
 }
 function MaterialAttribute__MapCategory_658CFBF6(this$, f) {
-  return new MaterialAttribute(this$.ID, map(f, this$.CharacteristicType));
+  let option = void 0;
+  return new MaterialAttribute(this$.ID, (option = this$.CharacteristicType, option != null ? f(value(option)) : void 0));
 }
 function MaterialAttribute__SetCategory_ZDED3A0F(this$, c) {
   return new MaterialAttribute(this$.ID, c);

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

@@ -1,31 +1,31 @@
-import { Record } from '@fable-org/fable-library-js/Types.js';
-import { Option } from '@fable-org/fable-library-js/Option.js';
-import { MaterialAttribute } from './MaterialAttribute.js';
-import { OntologyAnnotation } from '../OntologyAnnotation.js';
-import { IISAPrintable } from '../Helper/Printer.js';
-import { Value_$union } from '../Value.js';
-import { IComparable, IEquatable } from '@fable-org/fable-library-js/Util.js';
-import { IPropertyValue } from '../IPropertyValue.js';
-import { TypeInfo } from '@fable-org/fable-library-js/Reflection.js';
+import { Record } from '@fable-org/fable-library-ts/Types.ts';
+import { Option } from '@fable-org/fable-library-ts/Option.ts';
+import { MaterialAttribute } from './MaterialAttribute.ts';
+import { OntologyAnnotation } from '../OntologyAnnotation.ts';
+import { ScalarValue_$union } from '../ScalarValue.ts';
+import { IISAPrintable } from '../Helper/Printer.ts';
+import { IComparable, IEquatable } from '@fable-org/fable-library-ts/Util.ts';
+import { IPropertyValue } from '../IPropertyValue.ts';
+import { TypeInfo } from '@fable-org/fable-library-ts/Reflection.ts';
 export declare class MaterialAttributeValue extends Record implements IEquatable<MaterialAttributeValue>, IComparable<MaterialAttributeValue>, IPropertyValue, IISAPrintable {
     readonly ID: Option<string>;
     readonly Category: Option<MaterialAttribute>;
-    readonly Value: Option<Value_$union>;
+    readonly Value: Option<ScalarValue_$union>;
     readonly Unit: Option<OntologyAnnotation>;
-    constructor(ID: Option<string>, Category: Option<MaterialAttribute>, Value: Option<Value_$union>, Unit: Option<OntologyAnnotation>);
+    constructor(ID: Option<string>, Category: Option<MaterialAttribute>, Value: Option<ScalarValue_$union>, Unit: Option<OntologyAnnotation>);
     Print(): string;
     PrintCompact(): string;
     AlternateName(): Option<string>;
     MeasurementMethod(): Option<string>;
     Description(): Option<string>;
     GetCategory(): Option<OntologyAnnotation>;
-    GetValue(): Option<Value_$union>;
+    GetValue(): Option<ScalarValue_$union>;
     GetUnit(): Option<OntologyAnnotation>;
     GetAdditionalType(): string;
 }
 export declare function MaterialAttributeValue_$reflection(): TypeInfo;
-export declare function MaterialAttributeValue_make(id: Option<string>, category: Option<MaterialAttribute>, value: Option<Value_$union>, unit: Option<OntologyAnnotation>): MaterialAttributeValue;
-export declare function MaterialAttributeValue_create_ZE1D108D(Id?: string, Category?: MaterialAttribute, Value?: Value_$union, Unit?: OntologyAnnotation): MaterialAttributeValue;
+export declare function MaterialAttributeValue_make(id: Option<string>, category: Option<MaterialAttribute>, value: Option<ScalarValue_$union>, unit: Option<OntologyAnnotation>): MaterialAttributeValue;
+export declare function MaterialAttributeValue_create_Z3D1B2C3(Id?: string, Category?: MaterialAttribute, Value?: ScalarValue_$union, Unit?: OntologyAnnotation): MaterialAttributeValue;
 export declare function MaterialAttributeValue_get_empty(): MaterialAttributeValue;
 /**
  * Returns the name of the category as string
@@ -51,5 +51,5 @@ export declare function MaterialAttributeValue_getNameAsString_Z772273B8(mv: Mat
  * Returns true if the given name matches the name of the characteristic value
  */
 export declare function MaterialAttributeValue_nameEqualsString(name: string, mv: MaterialAttributeValue): boolean;
-export declare function MaterialAttributeValue_createAsPV(alternateName: Option<string>, measurementMethod: Option<string>, description: Option<string>, category: Option<OntologyAnnotation>, value: Option<Value_$union>, unit: Option<OntologyAnnotation>): MaterialAttributeValue;
+export declare function MaterialAttributeValue_createAsPV(alternateName: Option<string>, measurementMethod: Option<string>, description: Option<string>, category: Option<OntologyAnnotation>, value: Option<ScalarValue_$union>, unit: Option<OntologyAnnotation>): MaterialAttributeValue;
 //# sourceMappingURL=MaterialAttributeValue.d.ts.map

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

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