@nfdi4plants/arctrl 3.2.3 → 3.3.1

package/dist/ts/node_modules/@fable-org/fable-library-ts/Long.js

@@ -1,6 +1,7 @@
-import { isValid, getPrefix } from './Int32.js';
+import { isValid, getPrefix, parseOverflow } from './Int32.js';
 import { fromString } from './BigInt.js';
 import { Exception } from './Util.js';
+import { ArgumentNullException_$ctor_Z721C83C5, FormatException_$ctor_Z721C83C5 } from './System.js';
 
 function getRange(unsigned, bitsize) {
   switch (bitsize) {
@@ -11,6 +12,9 @@ function getRange(unsigned, bitsize) {
   }
 }
 function parse(str, style, unsigned, bitsize, radix) {
+  if (str == null) {
+    throw ArgumentNullException_$ctor_Z721C83C5("s");
+  }
   const res = isValid(str, style, radix);
   if (res != null) {
     let v = fromString(getPrefix(res.radix) + res.digits);
@@ -25,8 +29,9 @@ function parse(str, style, unsigned, bitsize, radix) {
     if (v >= min && v <= max) {
       return v;
     }
+    throw parseOverflow(unsigned, bitsize);
   }
-  throw new Exception(`The input string ${str} was not in a correct format.`);
+  throw FormatException_$ctor_Z721C83C5(`The input string '${str}' was not in a correct format.`);
 }
 function tryParse(str, style, unsigned, bitsize, defValue) {
   try {

package/dist/ts/node_modules/@fable-org/fable-library-ts/Map.js

@@ -1,10 +1,11 @@
 import { class_type, record_type, list_type, bool_type, option_type } from './Reflection.js';
 import { value, some } from './Option.js';
-import { Exception, isArrayLike, getEnumerator, disposeSafe, equals, toIterator, compare, structuralHash } from './Util.js';
+import { Exception, isArrayLike, getEnumerator, disposeSafe, physicalHash, equals, toIterator, compare, structuralHash } from './Util.js';
 import { KeyNotFoundException_$ctor } from './System.Collections.Generic.js';
 import { cons, empty as empty$1, fold as fold$1, FSharpList, isEmpty as isEmpty$1, tail, head, ofArrayWithTail, singleton } from './List.js';
 import { setItem, fill, item, map as map$2 } from './Array.js';
 import { Record } from './Types.js';
+import { Operators_InvalidOp } from './FSharp.Core.js';
 import { unfold, map as map$1, compareWith, iterate as iterate$1, pick as pick$1, tryPick as tryPick$1 } from './Seq.js';
 import { join, format } from './String.js';
 import { NotSupportedException_$ctor_Z721C83C5 } from './System.js';
@@ -58,7 +59,7 @@ function MapTreeModule_sizeAux(acc_mut, m_mut) {
     while (true) {
       const acc = acc_mut, m = m_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         if (m2 instanceof MapTreeNode$2) {
           const mn = m2;
           acc_mut = MapTreeModule_sizeAux(acc + 1, MapTreeNode$2__get_Left(mn));
@@ -81,7 +82,7 @@ function MapTreeModule_mk(l, k, v, r) {
   let hl;
   const m = l;
   if (m != null) {
-    const m2 = value(m);
+    const m2 = m;
     hl = m2 instanceof MapTreeNode$2 ? (mn = m2, MapTreeNode$2__get_Height(mn)) : 1;
   } else {
     hl = 0;
@@ -89,7 +90,7 @@ function MapTreeModule_mk(l, k, v, r) {
   let hr;
   const m_1 = r;
   if (m_1 != null) {
-    const m2_1 = value(m_1);
+    const m2_1 = m_1;
     hr = m2_1 instanceof MapTreeNode$2 ? (mn_1 = m2_1, MapTreeNode$2__get_Height(mn_1)) : 1;
   } else {
     hr = 0;
@@ -106,7 +107,7 @@ function MapTreeModule_rebalance(t1, k, v, t2) {
   let t1h;
   const m = t1;
   if (m != null) {
-    const m2 = value(m);
+    const m2 = m;
     t1h = m2 instanceof MapTreeNode$2 ? (mn = m2, MapTreeNode$2__get_Height(mn)) : 1;
   } else {
     t1h = 0;
@@ -114,7 +115,7 @@ function MapTreeModule_rebalance(t1, k, v, t2) {
   let t2h;
   const m_1 = t2;
   if (m_1 != null) {
-    const m2_1 = value(m_1);
+    const m2_1 = m_1;
     t2h = m2_1 instanceof MapTreeNode$2 ? (mn_1 = m2_1, MapTreeNode$2__get_Height(mn_1)) : 1;
   } else {
     t2h = 0;
@@ -123,7 +124,7 @@ function MapTreeModule_rebalance(t1, k, v, t2) {
     const matchValue = value(t2);
     if (matchValue instanceof MapTreeNode$2) {
       const t2$0027 = matchValue;
-      if ((m_2 = MapTreeNode$2__get_Left(t2$0027), m_2 != null ? (m2_2 = value(m_2), m2_2 instanceof MapTreeNode$2 ? (mn_2 = m2_2, MapTreeNode$2__get_Height(mn_2)) : 1) : 0) > t1h + 1) {
+      if ((m_2 = MapTreeNode$2__get_Left(t2$0027), m_2 != null ? (m2_2 = m_2, m2_2 instanceof MapTreeNode$2 ? (mn_2 = m2_2, MapTreeNode$2__get_Height(mn_2)) : 1) : 0) > t1h + 1) {
         const matchValue_1 = value(MapTreeNode$2__get_Left(t2$0027));
         if (matchValue_1 instanceof MapTreeNode$2) {
           const t2l = matchValue_1;
@@ -141,7 +142,7 @@ function MapTreeModule_rebalance(t1, k, v, t2) {
     const matchValue_2 = value(t1);
     if (matchValue_2 instanceof MapTreeNode$2) {
       const t1$0027 = matchValue_2;
-      if ((m_3 = MapTreeNode$2__get_Right(t1$0027), m_3 != null ? (m2_3 = value(m_3), m2_3 instanceof MapTreeNode$2 ? (mn_3 = m2_3, MapTreeNode$2__get_Height(mn_3)) : 1) : 0) > t2h + 1) {
+      if ((m_3 = MapTreeNode$2__get_Right(t1$0027), m_3 != null ? (m2_3 = m_3, m2_3 instanceof MapTreeNode$2 ? (mn_3 = m2_3, MapTreeNode$2__get_Height(mn_3)) : 1) : 0) > t2h + 1) {
         const matchValue_3 = value(MapTreeNode$2__get_Right(t1$0027));
         if (matchValue_3 instanceof MapTreeNode$2) {
           const t1r = matchValue_3;
@@ -161,7 +162,7 @@ function MapTreeModule_rebalance(t1, k, v, t2) {
 }
 function MapTreeModule_add(comparer, k, v, m) {
   if (m != null) {
-    const m2 = value(m);
+    const m2 = m;
     const c = comparer.Compare(k, MapTreeLeaf$2__get_Key(m2)) | 0;
     if (m2 instanceof MapTreeNode$2) {
       const mn = m2;
@@ -188,7 +189,7 @@ function MapTreeModule_tryFind(comparer_mut, k_mut, m_mut) {
     while (true) {
       const comparer = comparer_mut, k = k_mut, m = m_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         const c = comparer.Compare(k, MapTreeLeaf$2__get_Key(m2)) | 0;
         if (c === 0) {
           return some(MapTreeLeaf$2__get_Value(m2));
@@ -228,7 +229,7 @@ function MapTreeModule_partitionAux(comparer_mut, f_mut, m_mut, acc__mut, acc__1
       const comparer = comparer_mut, f = f_mut, m = m_mut, acc_ = acc__mut, acc__1 = acc__1_mut;
       const acc = [acc_, acc__1];
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         if (m2 instanceof MapTreeNode$2) {
           const mn = m2;
           const acc_1 = MapTreeModule_partitionAux(comparer, f, MapTreeNode$2__get_Right(mn), acc[0], acc[1]);
@@ -263,7 +264,7 @@ function MapTreeModule_filterAux(comparer_mut, f_mut, m_mut, acc_mut) {
     while (true) {
       const comparer = comparer_mut, f = f_mut, m = m_mut, acc = acc_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         if (m2 instanceof MapTreeNode$2) {
           const mn = m2;
           const acc_1 = MapTreeModule_filterAux(comparer, f, MapTreeNode$2__get_Left(mn), acc);
@@ -287,7 +288,7 @@ function MapTreeModule_filter(comparer, f, m) {
 }
 function MapTreeModule_spliceOutSuccessor(m) {
   if (m != null) {
-    const m2 = value(m);
+    const m2 = m;
     if (m2 instanceof MapTreeNode$2) {
       const mn = m2;
       if (MapTreeNode$2__get_Left(mn) == null) {
@@ -305,7 +306,7 @@ function MapTreeModule_spliceOutSuccessor(m) {
 }
 function MapTreeModule_remove(comparer, k, m) {
   if (m != null) {
-    const m2 = value(m);
+    const m2 = m;
     const c = comparer.Compare(k, MapTreeLeaf$2__get_Key(m2)) | 0;
     if (m2 instanceof MapTreeNode$2) {
       const mn = m2;
@@ -334,7 +335,7 @@ function MapTreeModule_remove(comparer, k, m) {
 }
 function MapTreeModule_change(comparer, k, u, m) {
   if (m != null) {
-    const m2 = value(m);
+    const m2 = m;
     if (m2 instanceof MapTreeNode$2) {
       const mn = m2;
       const c = comparer.Compare(k, MapTreeLeaf$2__get_Key(mn)) | 0;
@@ -394,7 +395,7 @@ function MapTreeModule_mem(comparer_mut, k_mut, m_mut) {
     while (true) {
       const comparer = comparer_mut, k = k_mut, m = m_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         const c = comparer.Compare(k, MapTreeLeaf$2__get_Key(m2)) | 0;
         if (m2 instanceof MapTreeNode$2) {
           const mn = m2;
@@ -425,7 +426,7 @@ function MapTreeModule_iterOpt(f_mut, m_mut) {
     while (true) {
       const f = f_mut, m = m_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         if (m2 instanceof MapTreeNode$2) {
           const mn = m2;
           MapTreeModule_iterOpt(f, MapTreeNode$2__get_Left(mn));
@@ -448,7 +449,7 @@ function MapTreeModule_tryPickOpt(f_mut, m_mut) {
     while (true) {
       const f = f_mut, m = m_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         if (m2 instanceof MapTreeNode$2) {
           const mn = m2;
           const matchValue = MapTreeModule_tryPickOpt(f, MapTreeNode$2__get_Left(mn));
@@ -481,7 +482,7 @@ function MapTreeModule_existsOpt(f_mut, m_mut) {
     while (true) {
       const f = f_mut, m = m_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         if (m2 instanceof MapTreeNode$2) {
           const mn = m2;
           if (MapTreeModule_existsOpt(f, MapTreeNode$2__get_Left(mn)) ? true : f(MapTreeLeaf$2__get_Key(mn), MapTreeLeaf$2__get_Value(mn))) {
@@ -508,7 +509,7 @@ function MapTreeModule_forallOpt(f_mut, m_mut) {
     while (true) {
       const f = f_mut, m = m_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         if (m2 instanceof MapTreeNode$2) {
           const mn = m2;
           if (MapTreeModule_forallOpt(f, MapTreeNode$2__get_Left(mn)) && f(MapTreeLeaf$2__get_Key(mn), MapTreeLeaf$2__get_Value(mn))) {
@@ -532,7 +533,7 @@ function MapTreeModule_forall(f, m) {
 }
 function MapTreeModule_map(f, m) {
   if (m != null) {
-    const m2 = value(m);
+    const m2 = m;
     if (m2 instanceof MapTreeNode$2) {
       const mn = m2;
       const l2 = MapTreeModule_map(f, MapTreeNode$2__get_Left(mn));
@@ -548,7 +549,7 @@ function MapTreeModule_map(f, m) {
 }
 function MapTreeModule_mapiOpt(f, m) {
   if (m != null) {
-    const m2 = value(m);
+    const m2 = m;
     if (m2 instanceof MapTreeNode$2) {
       const mn = m2;
       const l2 = MapTreeModule_mapiOpt(f, MapTreeNode$2__get_Left(mn));
@@ -570,7 +571,7 @@ function MapTreeModule_foldBackOpt(f_mut, m_mut, x_mut) {
     while (true) {
       const f = f_mut, m = m_mut, x = x_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         if (m2 instanceof MapTreeNode$2) {
           const mn = m2;
           const x_1 = MapTreeModule_foldBackOpt(f, MapTreeNode$2__get_Right(mn), x);
@@ -596,7 +597,7 @@ function MapTreeModule_foldOpt(f_mut, x_mut, m_mut) {
     while (true) {
       const f = f_mut, x = x_mut, m = m_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         if (m2 instanceof MapTreeNode$2) {
           const mn = m2;
           f_mut = f;
@@ -621,7 +622,7 @@ function MapTreeModule_foldSectionOpt(comparer, lo, hi, f, m, x) {
       while (true) {
         const f_1 = f_1_mut, m_1 = m_1_mut, x_1 = x_1_mut;
         if (m_1 != null) {
-          const m2 = value(m_1);
+          const m2 = m_1;
           if (m2 instanceof MapTreeNode$2) {
             const mn = m2;
             const cLoKey = comparer.Compare(lo, MapTreeLeaf$2__get_Key(mn)) | 0;
@@ -666,7 +667,7 @@ function MapTreeModule_toList(m) {
       while (true) {
         const m_1 = m_1_mut, acc = acc_mut;
         if (m_1 != null) {
-          const m2 = value(m_1);
+          const m2 = m_1;
           if (m2 instanceof MapTreeNode$2) {
             const mn = m2;
             m_1_mut = MapTreeNode$2__get_Left(mn);
@@ -743,6 +744,12 @@ class MapTreeModule_MapIterator$2 extends Record {
     this.stack = stack;
     this.started = started;
   }
+  Equals(other) {
+    return this === other;
+  }
+  GetHashCode() {
+    return physicalHash(this);
+  }
 }
 function MapTreeModule_MapIterator$2_$reflection(gen0, gen1) {
   return record_type("Map.MapTreeModule.MapIterator`2", [gen0, gen1], MapTreeModule_MapIterator$2, () => [["stack", list_type(option_type(MapTreeLeaf$2_$reflection(gen0, gen1)))], ["started", bool_type]]);
@@ -755,7 +762,7 @@ function MapTreeModule_collapseLHS(stack_mut) {
         const rest = tail(stack);
         const m = head(stack);
         if (m != null) {
-          const m2 = value(m);
+          const m2 = m;
           if (m2 instanceof MapTreeNode$2) {
             const mn = m2;
             stack_mut = ofArrayWithTail([MapTreeNode$2__get_Left(mn), MapTreeLeaf$2_$ctor_5BDDA1(MapTreeLeaf$2__get_Key(mn), MapTreeLeaf$2__get_Value(mn)), MapTreeNode$2__get_Right(mn)], rest);
@@ -777,17 +784,17 @@ function MapTreeModule_mkIterator(m) {
   return new MapTreeModule_MapIterator$2(MapTreeModule_collapseLHS(singleton(m)), false);
 }
 function MapTreeModule_notStarted() {
-  throw new Exception("enumeration not started");
+  throw Operators_InvalidOp("Enumeration has not started. Call MoveNext.");
 }
 function MapTreeModule_alreadyFinished() {
-  throw new Exception("enumeration already finished");
+  throw Operators_InvalidOp("Enumeration already finished.");
 }
 function MapTreeModule_current(i) {
   if (i.started) {
     const matchValue = i.stack;
     if (!isEmpty$1(matchValue)) {
       if (head(matchValue) != null) {
-        const m = value(head(matchValue));
+        const m = head(matchValue);
         if (m instanceof MapTreeNode$2) {
           throw new Exception("Please report error: Map iterator, unexpected stack for current");
         } else {
@@ -808,7 +815,7 @@ function MapTreeModule_moveNext(i) {
     const matchValue = i.stack;
     if (!isEmpty$1(matchValue)) {
       if (head(matchValue) != null) {
-        const m = value(head(matchValue));
+        const m = head(matchValue);
         if (m instanceof MapTreeNode$2) {
           throw new Exception("Please report error: Map iterator, unexpected stack for moveNext");
         } else {
@@ -859,7 +866,7 @@ function MapTreeModule_leftmost(m_mut) {
     while (true) {
       const m = m_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         let matchResult = void 0, nd_1 = void 0;
         if (m2 instanceof MapTreeNode$2) {
           if (MapTreeNode$2__get_Height(m2) > 1) {
@@ -893,7 +900,7 @@ function MapTreeModule_rightmost(m_mut) {
     while (true) {
       const m = m_mut;
       if (m != null) {
-        const m2 = value(m);
+        const m2 = m;
         let matchResult = void 0, nd_1 = void 0;
         if (m2 instanceof MapTreeNode$2) {
           if (MapTreeNode$2__get_Height(m2) > 1) {
@@ -999,13 +1006,13 @@ class FSharpMap {
     }, this$, that)) : 1) | 0;
   }
   "System.Collections.Generic.ICollection`1.Add2B595"(x) {
-    throw NotSupportedException_$ctor_Z721C83C5("Map cannot be mutated");
+    throw NotSupportedException_$ctor_Z721C83C5("Map values cannot be mutated.");
   }
   "System.Collections.Generic.ICollection`1.Clear"() {
-    throw NotSupportedException_$ctor_Z721C83C5("Map cannot be mutated");
+    throw NotSupportedException_$ctor_Z721C83C5("Map values cannot be mutated.");
   }
   "System.Collections.Generic.ICollection`1.Remove2B595"(x) {
-    throw NotSupportedException_$ctor_Z721C83C5("Map cannot be mutated");
+    throw NotSupportedException_$ctor_Z721C83C5("Map values cannot be mutated.");
   }
   "System.Collections.Generic.ICollection`1.Contains2B595"(x) {
     const m = this;
@@ -1031,10 +1038,10 @@ class FSharpMap {
     return FSharpMap__get_Count(m) | 0;
   }
   clear() {
-    throw new Exception("Map cannot be mutated");
+    throw NotSupportedException_$ctor_Z721C83C5("Map values cannot be mutated.");
   }
   delete(_arg) {
-    throw new Exception("Map cannot be mutated");
+    throw NotSupportedException_$ctor_Z721C83C5("Map values cannot be mutated.");
     return false;
   }
   entries() {
@@ -1055,7 +1062,7 @@ class FSharpMap {
   }
   set(k, v) {
     const m = this;
-    throw new Exception("Map cannot be mutated");
+    throw NotSupportedException_$ctor_Z721C83C5("Map values cannot be mutated.");
     return m;
   }
   values() {

package/dist/ts/node_modules/@fable-org/fable-library-ts/MutableMap.js

@@ -1,10 +1,9 @@
 import { defaultOf, getEnumerator, disposeSafe, toIterator, equals } from './Util.js';
 import { concat, iterateIndexed, toArray, delay, map, iterate } from './Seq.js';
-import { value } from './Option.js';
 import { setItem, item } from './Array.js';
 import { FSharpRef } from './Types.js';
 import { class_type } from './Reflection.js';
-import { tryGetValue, getItemFromDict } from './MapUtil.js';
+import { getItemFromDict } from './MapUtil.js';
 import { KeyNotFoundException_$ctor_Z721C83C5 } from './System.Collections.Generic.js';
 import { ArgumentException_$ctor_Z721C83C5 } from './System.js';
 import { format } from './String.js';
@@ -15,6 +14,7 @@ class Dictionary {
     this.comparer = comparer;
     this$.contents = this;
     this.hashMap = /* @__PURE__ */ new Map([]);
+    this.count = 0;
     this["init@9"] = 1;
     const enumerator = getEnumerator(pairs);
     try {
@@ -57,9 +57,9 @@ class Dictionary {
     const matchValue = Dictionary__TryFind_2B595(this$, item[0]);
     let matchResult = void 0, pair_1 = void 0;
     if (matchValue != null) {
-      if (equals(value(matchValue)[1], item[1])) {
+      if (equals(matchValue[1], item[1])) {
         matchResult = 0;
-        pair_1 = value(matchValue);
+        pair_1 = matchValue;
       } else {
         matchResult = 1;
       }
@@ -91,9 +91,9 @@ class Dictionary {
     const matchValue = Dictionary__TryFind_2B595(this$, item[0]);
     let matchResult = void 0, pair_1 = void 0;
     if (matchValue != null) {
-      if (equals(value(matchValue)[1], item[1])) {
+      if (equals(matchValue[1], item[1])) {
         matchResult = 0;
-        pair_1 = value(matchValue);
+        pair_1 = matchValue;
       } else {
         matchResult = 1;
       }
@@ -131,12 +131,12 @@ class Dictionary {
     const this$ = this;
     return Dictionary__Remove_2B595(this$, key);
   }
-  "System.Collections.Generic.IDictionary`2.TryGetValue6DC89625"(key, value$1) {
+  "System.Collections.Generic.IDictionary`2.TryGetValue6DC89625"(key, value) {
     const this$ = this;
     const matchValue = Dictionary__TryFind_2B595(this$, key);
     if (matchValue != null) {
-      const pair = value(matchValue);
-      value$1.contents = pair[1];
+      const pair = matchValue;
+      value.contents = pair[1];
       return true;
     } else {
       return false;
@@ -196,36 +196,36 @@ function Dictionary_$reflection(gen0, gen1) {
 function Dictionary_$ctor_6623D9B3(pairs, comparer) {
   return new Dictionary(pairs, comparer);
 }
-function Dictionary__TryFindIndex_2B595(this$, k) {
-  const h = this$.comparer.GetHashCode(k) | 0;
-  let matchValue;
-  let outArg = defaultOf();
-  matchValue = [tryGetValue(this$.hashMap, h, new FSharpRef(() => outArg, (v) => {
-    outArg = v;
-  })), outArg];
-  if (matchValue[0]) {
-    return [true, h, matchValue[1].findIndex((pair) => this$.comparer.Equals(k, pair[0]))];
+function Dictionary__TryFindBucket_Z524259A4(this$, h) {
+  if (this$.hashMap.has(h)) {
+    return getItemFromDict(this$.hashMap, h);
   } else {
-    return [false, h, -1];
+    return void 0;
   }
 }
-function Dictionary__TryFind_2B595(this$, k) {
-  const matchValue = Dictionary__TryFindIndex_2B595(this$, k);
-  let matchResult = void 0;
-  if (matchValue[0]) {
-    if (matchValue[2] > -1) {
-      matchResult = 0;
-    } else {
-      matchResult = 1;
+function Dictionary__FindIndex_Z61A8C007(this$, k, bucket) {
+  let i = 0;
+  let found = -1;
+  while (found < 0 && i < bucket.length) {
+    if (this$.comparer.Equals(k, item(i, bucket)[0])) {
+      found = i | 0;
     }
-  } else {
-    matchResult = 1;
+    i = i + 1 | 0;
   }
-  switch (matchResult) {
-    case 0:
-      return item(matchValue[2], getItemFromDict(this$.hashMap, matchValue[1]));
-    default:
+  return found | 0;
+}
+function Dictionary__TryFind_2B595(this$, k) {
+  const matchValue = Dictionary__TryFindBucket_Z524259A4(this$, this$.comparer.GetHashCode(k));
+  if (matchValue == null) {
+    return void 0;
+  } else {
+    const bucket = matchValue;
+    const i = Dictionary__FindIndex_Z61A8C007(this$, k, bucket) | 0;
+    if (i > -1) {
+      return item(i, bucket);
+    } else {
       return void 0;
+    }
   }
 }
 function Dictionary__get_Comparer(this$) {
@@ -233,94 +233,77 @@ function Dictionary__get_Comparer(this$) {
 }
 function Dictionary__Clear(this$) {
   this$.hashMap.clear();
+  this$.count = 0;
 }
 function Dictionary__get_Count(this$) {
-  let count = 0;
-  let enumerator = getEnumerator(this$.hashMap.values());
-  try {
-    while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
-      const pairs = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
-      count = count + pairs.length | 0;
-    }
-  } finally {
-    disposeSafe(enumerator);
-  }
-  return count | 0;
+  return this$.count | 0;
 }
 function Dictionary__get_Item_2B595(this$, k) {
   const matchValue = Dictionary__TryFind_2B595(this$, k);
   if (matchValue != null) {
-    return value(matchValue)[1];
+    return matchValue[1];
   } else {
     throw KeyNotFoundException_$ctor_Z721C83C5("The item was not found in collection");
   }
 }
 function Dictionary__set_Item_5BDDA1(this$, k, v) {
-  const matchValue = Dictionary__TryFindIndex_2B595(this$, k);
-  if (matchValue[0]) {
-    if (matchValue[2] > -1) {
-      setItem(getItemFromDict(this$.hashMap, matchValue[1]), matchValue[2], [k, v]);
+  const h = this$.comparer.GetHashCode(k) | 0;
+  const matchValue = Dictionary__TryFindBucket_Z524259A4(this$, h);
+  if (matchValue == null) {
+    this$.hashMap.set(h, [[k, v]]);
+    this$.count = this$.count + 1 | 0;
+  } else {
+    const bucket = matchValue;
+    const i = Dictionary__FindIndex_Z61A8C007(this$, k, bucket) | 0;
+    if (i > -1) {
+      setItem(bucket, i, [k, v]);
     } else {
-      void getItemFromDict(this$.hashMap, matchValue[1]).push([k, v]);
+      void bucket.push([k, v]);
+      this$.count = this$.count + 1 | 0;
     }
-  } else {
-    this$.hashMap.set(matchValue[1], [[k, v]]);
   }
 }
 function Dictionary__Add_5BDDA1(this$, k, v) {
-  const matchValue = Dictionary__TryFindIndex_2B595(this$, k);
-  if (matchValue[0]) {
-    if (matchValue[2] > -1) {
+  const h = this$.comparer.GetHashCode(k) | 0;
+  const matchValue = Dictionary__TryFindBucket_Z524259A4(this$, h);
+  if (matchValue == null) {
+    this$.hashMap.set(h, [[k, v]]);
+    this$.count = this$.count + 1 | 0;
+  } else {
+    const bucket = matchValue;
+    if (Dictionary__FindIndex_Z61A8C007(this$, k, bucket) > -1) {
       throw ArgumentException_$ctor_Z721C83C5(format("An item with the same key has already been added. Key: {0}", k));
-    } else {
-      void getItemFromDict(this$.hashMap, matchValue[1]).push([k, v]);
     }
-  } else {
-    this$.hashMap.set(matchValue[1], [[k, v]]);
+    void bucket.push([k, v]);
+    this$.count = this$.count + 1 | 0;
   }
 }
 function Dictionary__ContainsKey_2B595(this$, k) {
-  const matchValue = Dictionary__TryFindIndex_2B595(this$, k);
-  let matchResult = void 0;
-  if (matchValue[0]) {
-    if (matchValue[2] > -1) {
-      matchResult = 0;
-    } else {
-      matchResult = 1;
-    }
+  const matchValue = Dictionary__TryFindBucket_Z524259A4(this$, this$.comparer.GetHashCode(k));
+  if (matchValue == null) {
+    return false;
   } else {
-    matchResult = 1;
-  }
-  switch (matchResult) {
-    case 0:
-      return true;
-    default:
-      return false;
+    return Dictionary__FindIndex_Z61A8C007(this$, k, matchValue) > -1;
   }
 }
 function Dictionary__Remove_2B595(this$, k) {
-  const matchValue = Dictionary__TryFindIndex_2B595(this$, k);
-  let matchResult = void 0;
-  if (matchValue[0]) {
-    if (matchValue[2] > -1) {
-      matchResult = 0;
-    } else {
-      matchResult = 1;
-    }
+  const h = this$.comparer.GetHashCode(k) | 0;
+  const matchValue = Dictionary__TryFindBucket_Z524259A4(this$, h);
+  if (matchValue == null) {
+    return false;
   } else {
-    matchResult = 1;
-  }
-  switch (matchResult) {
-    case 0: {
-      const h_1 = matchValue[1] | 0;
-      getItemFromDict(this$.hashMap, h_1).splice(matchValue[2], 1);
-      if (getItemFromDict(this$.hashMap, h_1).length === 0) {
-        this$.hashMap.delete(h_1);
+    const bucket = matchValue;
+    const i = Dictionary__FindIndex_Z61A8C007(this$, k, bucket) | 0;
+    if (i > -1) {
+      bucket.splice(i, 1);
+      this$.count = this$.count - 1 | 0;
+      if (bucket.length === 0) {
+        this$.hashMap.delete(h);
       }
       return true;
-    }
-    default:
+    } else {
       return false;
+    }
   }
 }