@fncts/base 0.0.21 → 0.0.23

package/_cjs/collection/immutable/HashMap/api.cjs

@@ -8,7 +8,7 @@ exports._traverseWithIndex = void 0;
 exports._wilt = _wilt;
 exports._wiltWithIndex = void 0;
 exports._wither = _wither;
-exports.endMutation = exports.compact = exports.beginMutation = exports._witherWithIndex = void 0;
+exports.endMutation = exports.empty = exports.compact = exports.beginMutation = exports._witherWithIndex = void 0;
 exports.filter = filter;
 exports.filterWithIndex = exports.filterMapWithIndex = exports.filterMap = void 0;
 exports.flatMap = flatMap;
@@ -23,7 +23,7 @@ exports.isEmpty = isEmpty;
 exports.keySet = keySet;
 exports.keys = keys;
 exports.make = make;
-exports.makeWith = exports.makeDefault = void 0;
+exports.makeWith = void 0;
 exports.map = map;
 exports.mutate = exports.modifyHash = exports.modify = exports.mapWithIndex = void 0;
 exports.partition = partition;
@@ -34,7 +34,7 @@ exports.removeMany = removeMany;
 exports.set = exports.separate = void 0;
 exports.toArray = toArray;
 exports.toList = toList;
-exports.toSetDefault = toSetDefault;
+exports.toSet = toSet;
 exports.traverseWithIndex = exports.traverse = void 0;
 exports.union = union;
 exports.unionWith = unionWith;
@@ -42,41 +42,25 @@ exports.unsafeGet = unsafeGet;
 exports.update = update;
 exports.values = values;
 exports.witherWithIndex = exports.wither = exports.wiltWithIndex = exports.wilt = void 0;
-
 var tsplus_module_1 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/HashMap/definition"));
-
-var tsplus_module_2 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/typeclass/HashEq"));
-
+var tsplus_module_2 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/HashEq"));
 var tsplus_module_3 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/definition"));
-
 var tsplus_module_4 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/constructors"));
-
 var tsplus_module_5 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/immutable/HashSet/api"));
-
 var tsplus_module_6 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/collection/mutable/ListBuffer"));
-
 var tsplus_module_7 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/api"));
-
 var tsplus_module_8 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/function/api"));
-
 var tsplus_module_9 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Either/destructors"));
-
 var tsplus_module_10 = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/data/Maybe/destructors"));
-
 var _internal = /*#__PURE__*/require("@fncts/base/collection/immutable/HashMap/internal");
-
 var _function = /*#__PURE__*/require("@fncts/base/data/function");
-
 var P = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@fncts/base/typeclass"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const makeWith = makeWith_1;
 exports.makeWith = makeWith;
-const makeDefault = makeDefault_1;
-exports.makeDefault = makeDefault;
+const empty = empty_1;
+exports.empty = empty;
 const getHash = getHash_1;
 exports.getHash = getHash;
 const get = get_1;
@@ -127,45 +111,38 @@ const _witherWithIndex = _witherWithIndex_1;
 exports._witherWithIndex = _witherWithIndex;
 const _wiltWithIndex = _wiltWithIndex_1;
 exports._wiltWithIndex = _wiltWithIndex;
-
 /**
  * Does `map` contain any elements?
  *
  * @tsplus getter fncts.HashMap isEmpty
  */
-function isEmpty(map) {
-  return map && (0, _internal.isEmptyNode)(map.root);
+function isEmpty(self) {
+  return self && (0, _internal.isEmptyNode)(self.root);
 }
 /**
  * Creates a new map
  *
  * @tsplus static fncts.HashMapOps makeWith
  */
-
-
 function makeWith_1(config) {
   return new tsplus_module_1.HashMap(false, 0, config, _internal._EmptyNode, 0);
 }
 /**
  * @tsplus static fncts.HashMapOps __call
  */
-
-
 function make(...items) {
   return mutate_1(map => {
     for (const [key, value] of items) {
       set_1(key, value)(map);
     }
-  })(makeDefault_1());
+  })(empty_1());
 }
 /**
  * Make a new map that has randomly cached hash and structural equality
  *
- * @tsplus static fncts.HashMapOps makeDefault
+ * @tsplus static fncts.HashMapOps empty
  */
-
-
-function makeDefault_1() {
+function empty_1() {
   return makeWith_1(tsplus_module_2.StructuralStrict);
 }
 /**
@@ -173,19 +150,16 @@ function makeDefault_1() {
  *
  * @tsplus pipeable fncts.HashMapOps fromFoldable
  */
-
-
 function fromFoldable(config, S, F) {
-  return fka => {
+  return self => {
     return F.foldLeft(makeWith_1(config), (b, [k, a]) => {
       const oa = get_1(k)(b);
-
       if (tsplus_module_3.isJust(oa)) {
-        return set_1(k, S.combine(oa.value, a))(b);
+        return set_1(k, S.combine(a)(oa.value))(b);
       } else {
         return set_1(k, a)(b);
       }
-    })(fka);
+    })(self);
   };
 }
 /**
@@ -193,11 +167,9 @@ function fromFoldable(config, S, F) {
  *
  * @tsplus pipeable fncts.HashMap getHash
  */
-
-
 function getHash_1(key, hash) {
-  return map => {
-    return tryGetHash(map, key, hash);
+  return self => {
+    return tryGetHash(self, key, hash);
   };
 }
 /**
@@ -205,23 +177,19 @@ function getHash_1(key, hash) {
  *
  * @tsplus pipeable fncts.HashMap get
  */
-
-
 function get_1(key) {
-  return map => {
-    return tryGetHash(map, key, map.config.hash(key));
+  return self => {
+    return tryGetHash(self, key, self.config.hash(key));
   };
 }
 /**
  * Does an entry exist for `key` in `map`? Uses custom `hash`.
  *
- * @tsplus pipeable fncts.HashMap hashHash
+ * @tsplus pipeable fncts.HashMap hasHash
  */
-
-
 function hasHash(key, hash) {
-  return map => {
-    return tsplus_module_3.isJust(tryGetHash(map, key, hash));
+  return self => {
+    return tsplus_module_3.isJust(tryGetHash(self, key, hash));
   };
 }
 /**
@@ -229,11 +197,9 @@ function hasHash(key, hash) {
  *
  * @tsplus pipeable fncts.HashMap has
  */
-
-
 function has(key) {
-  return map => {
-    return tsplus_module_3.isJust(tryGetHash(map, key, map.config.hash(key)));
+  return self => {
+    return tsplus_module_3.isJust(tryGetHash(self, key, self.config.hash(key)));
   };
 }
 /**
@@ -247,15 +213,13 @@ function has(key) {
  *
  * @tsplus pipeable fncts.HashMap modifyHash
  */
-
-
 function modifyHash_1(key, hash, f) {
-  return map => {
+  return self => {
     const size = {
-      value: map.size
+      value: self.size
     };
-    const newRoot = map.root.modify(map.editable ? map.edit : NaN, map.config.equals, 0, f, hash, key, size);
-    return setTree(map, newRoot, size.value);
+    const newRoot = self.root.modify(self.editable ? self.edit : NaN, self.config.equals, 0, f, hash, key, size);
+    return setTree(self, newRoot, size.value);
   };
 }
 /**
@@ -269,11 +233,9 @@ function modifyHash_1(key, hash, f) {
  *
  * @tsplus pipeable fncts.HashMap modify
  */
-
-
 function modify_1(key, f) {
-  return map => {
-    return modifyHash_1(key, map.config.hash(key), f)(map);
+  return self => {
+    return modifyHash_1(key, self.config.hash(key), f)(self);
   };
 }
 /**
@@ -281,11 +243,9 @@ function modify_1(key, f) {
  *
  * @tsplus pipeable fncts.HashMap set
  */
-
-
 function set_1(key, value) {
-  return map => {
-    return modify_1(key, () => tsplus_module_4.just(value))(map);
+  return self => {
+    return modify_1(key, () => tsplus_module_4.just(value))(self);
   };
 }
 /**
@@ -293,11 +253,9 @@ function set_1(key, value) {
  *
  * @tsplus pipeable fncts.HashMap remove
  */
-
-
 function remove_1(key) {
-  return map => {
-    return modify_1(key, () => tsplus_module_4.nothing())(map);
+  return self => {
+    return modify_1(key, () => tsplus_module_4.nothing())(self);
   };
 }
 /**
@@ -305,15 +263,13 @@ function remove_1(key) {
  *
  * @tsplus pipeable fncts.HashMap removeMany
  */
-
-
 function removeMany(keys) {
-  return map => {
+  return self => {
     return mutate_1(m => {
       for (const k of keys) {
         remove_1(k)(m);
       }
-    })(map);
+    })(self);
   };
 }
 /**
@@ -321,32 +277,26 @@ function removeMany(keys) {
  *
  * @tsplus getter fncts.HashMap beginMutation
  */
-
-
-function beginMutation_1(map) {
-  return new tsplus_module_1.HashMap(true, map.edit + 1, map.config, map.root, map.size);
+function beginMutation_1(self) {
+  return new tsplus_module_1.HashMap(true, self.edit + 1, self.config, self.root, self.size);
 }
 /**
  * Mark `map` as immutable.
  *
  * @tsplus getter fncts.HashMap endMutation
  */
-
-
-function endMutation_1(map) {
-  map.editable = false;
-  return map;
+function endMutation_1(self) {
+  self.editable = false;
+  return self;
 }
 /**
  * Mutate `map` within the context of `f`.
  *
  * @tsplus pipeable fncts.HashMap mutate
  */
-
-
 function mutate_1(f) {
-  return map => {
-    const transient = beginMutation_1(map);
+  return self => {
+    const transient = beginMutation_1(self);
     f(transient);
     return endMutation_1(transient);
   };
@@ -356,51 +306,43 @@ function mutate_1(f) {
  *
  * @tsplus getter fncts.HashMap keys
  */
-
-
-function keys(map) {
-  return new tsplus_module_1.HashMapIterator(map, ([k]) => k);
+function keys(self) {
+  return new tsplus_module_1.HashMapIterator(self, ([k]) => k);
 }
 /**
  * Get the set of keys
  *
  * @tsplus getter fncts.HashMap keySet
  */
-
-
 function keySet(self) {
   return tsplus_module_5.mutate(set => {
     forEachWithIndex_1(k => {
       tsplus_module_5.add(k)(set);
     })(self);
-  })(tsplus_module_5.make(self.config));
+  })(tsplus_module_5.emptyWith(self.config));
 }
 /**
  * Get the set of values
  *
- * @tsplus getter fncts.HashMap keySetDefault
+ * @tsplus getter fncts.HashMap toSet
  */
-
-
-function toSetDefault(map) {
+function toSet(self) {
   return tsplus_module_5.mutate(set => {
     forEach_1(v => {
       tsplus_module_5.add(v)(set);
-    })(map);
-  })(tsplus_module_5.makeDefault());
+    })(self);
+  })(tsplus_module_5.empty());
 }
 /**
  * Get the set of values
  *
  * @tsplus getter fncts.HashMap toList
  */
-
-
-function toList(map) {
+function toList(self) {
   const buffer = new tsplus_module_6.ListBuffer();
   forEachWithIndex_1((k, v) => {
     buffer.append([k, v]);
-  })(map);
+  })(self);
   return buffer.toList;
 }
 /**
@@ -408,15 +350,13 @@ function toList(map) {
  *
  * @tsplus getter fncts.HashMap toArray
  */
-
-
-function toArray(map) {
-  const buffer = Array(map.size);
+function toArray(self) {
+  const buffer = Array(self.size);
   let i = 0;
   forEachWithIndex_1((k, v) => {
     buffer[i] = [k, v];
     i++;
-  })(map);
+  })(self);
   return buffer;
 }
 /**
@@ -424,21 +364,17 @@ function toArray(map) {
  *
  * @tsplus getter fncts.HashMap values
  */
-
-
-function values(map) {
-  return new tsplus_module_1.HashMapIterator(map, ([, v]) => v);
+function values(self) {
+  return new tsplus_module_1.HashMapIterator(self, ([, v]) => v);
 }
 /**
  * Update a value if exists
  *
  * @tsplus pipeable fncts.HashMap update
  */
-
-
 function update(key, f) {
-  return map => {
-    return modify_1(key, v => tsplus_module_7.map(f)(v))(map);
+  return self => {
+    return modify_1(key, v => tsplus_module_7.map(f)(v))(self);
   };
 }
 /**
@@ -446,11 +382,9 @@ function update(key, f) {
  *
  * @tsplus pipeable fncts.HashMap forEachWithIndex
  */
-
-
 function forEachWithIndex_1(f) {
-  return map => {
-    foldLeftWithIndex_1(undefined, (key, _, value) => f(key, value, map))(map);
+  return self => {
+    foldLeftWithIndex_1(undefined, (key, _, value) => f(key, value, self))(self);
   };
 }
 /**
@@ -458,11 +392,9 @@ function forEachWithIndex_1(f) {
  *
  * @tsplus pipeable fncts.HashMap forEach
  */
-
-
 function forEach_1(f) {
-  return map => {
-    return forEachWithIndex_1((_, v, m) => f(v, m))(map);
+  return self => {
+    return forEachWithIndex_1((_, v, m) => f(v, m))(self);
   };
 }
 /**
@@ -470,11 +402,9 @@ function forEach_1(f) {
  *
  * @tsplus pipeable fncts.HashMap mapWithIndex
  */
-
-
 function mapWithIndex_1(f) {
-  return fa => {
-    return foldLeftWithIndex_1(makeWith_1(fa.config), (k, z, v) => set_1(k, f(k, v))(z))(fa);
+  return self => {
+    return foldLeftWithIndex_1(makeWith_1(self.config), (k, z, v) => set_1(k, f(k, v))(z))(self);
   };
 }
 /**
@@ -482,11 +412,9 @@ function mapWithIndex_1(f) {
  *
  * @tsplus pipeable fncts.HashMap map
  */
-
-
 function map(f) {
-  return fa => {
-    return mapWithIndex_1((_, a) => f(a))(fa);
+  return self => {
+    return mapWithIndex_1((_, a) => f(a))(self);
   };
 }
 /**
@@ -494,15 +422,13 @@ function map(f) {
  *
  * @tsplus pipeable fncts.HashMap flatMapWithIndex
  */
-
-
 function flatMapWithIndex_1(f) {
-  return ma => {
-    return foldLeftWithIndex_1(makeWith_1(ma.config), (k, z, v) => mutate_1(m => {
+  return self => {
+    return foldLeftWithIndex_1(makeWith_1(self.config), (k, z, v) => mutate_1(m => {
       forEachWithIndex_1((k1, a1) => {
         set_1(k1, a1)(m);
       })(f(k, v));
-    })(z))(ma);
+    })(z))(self);
   };
 }
 /**
@@ -510,11 +436,9 @@ function flatMapWithIndex_1(f) {
  *
  * @tsplus pipeable fncts.HashMap flatMap
  */
-
-
 function flatMap(f) {
-  return ma => {
-    return flatMapWithIndex_1((_, a) => f(a))(ma);
+  return self => {
+    return flatMapWithIndex_1((_, a) => f(a))(self);
   };
 }
 /**
@@ -522,39 +446,32 @@ function flatMap(f) {
  *
  * @tsplus getter fncts.HashMap compact
  */
-
-
-function compact_1(map) {
-  return filterMap_1(tsplus_module_8.identity)(map);
+function compact_1(self) {
+  return filterMap_1(tsplus_module_8.identity)(self);
 }
 /**
  * Removes `Either` values into two separate `HashMaps`
  *
  * @tsplus getter fncts.HashMap separate
  */
-
-
-function separate_1(map) {
-  return partitionMap_1(tsplus_module_8.identity)(map);
+function separate_1(self) {
+  return partitionMap_1(tsplus_module_8.identity)(self);
 }
 /**
  * Filter out None and map
  *
  * @tsplus pipeable fncts.HashMap filterMapWithIndex
  */
-
-
 function filterMapWithIndex_1(f) {
-  return map => {
+  return self => {
     return mutate_1(m => {
-      for (const [k, a] of map) {
+      for (const [k, a] of self) {
         const o = f(k, a);
-
         if (tsplus_module_3.isJust(o)) {
           set_1(k, o.value)(m);
         }
       }
-    })(makeWith_1(map.config));
+    })(makeWith_1(self.config));
   };
 }
 /**
@@ -562,79 +479,69 @@ function filterMapWithIndex_1(f) {
  *
  * @tsplus pipeable fncts.HashMap filterMap
  */
-
-
 function filterMap_1(f) {
-  return map => {
-    return filterMapWithIndex_1((_, a) => f(a))(map);
+  return self => {
+    return filterMapWithIndex_1((_, a) => f(a))(self);
   };
 }
-
 function filterWithIndex_1(predicate) {
-  return map => {
+  return self => {
     return mutate_1(m => {
-      for (const [k, a] of map) {
+      for (const [k, a] of self) {
         if (predicate(k, a)) {
           set_1(k, a)(m);
         }
       }
-    })(makeWith_1(map.config));
+    })(makeWith_1(self.config));
   };
 }
-
 function filter(predicate) {
-  return map => {
-    return filterWithIndex_1((_, a) => predicate(a))(map);
+  return self => {
+    return filterWithIndex_1((_, a) => predicate(a))(self);
   };
 }
 /**
  * @tsplus pipeable fncts.HashMap partitionMapWithIndex
  */
-
-
 function partitionMapWithIndex_1(f) {
-  return map => {
-    const left = beginMutation_1(makeWith_1(map.config));
-    const right = beginMutation_1(makeWith_1(map.config));
+  return self => {
+    const left = beginMutation_1(makeWith_1(self.config));
+    const right = beginMutation_1(makeWith_1(self.config));
     forEachWithIndex_1((k, v) => {
       tsplus_module_9.match(a => {
         set_1(k, a)(left);
       }, b => {
         set_1(k, b)(right);
       })(f(k, v));
-    })(map);
+    })(self);
     return [endMutation_1(left), endMutation_1(right)];
   };
 }
 /**
  * @tsplus pipeable fncts.HashMap partitionMap
  */
-
-
 function partitionMap_1(f) {
-  return map => {
-    return partitionMapWithIndex_1((_, a) => f(a))(map);
+  return self => {
+    return partitionMapWithIndex_1((_, a) => f(a))(self);
   };
 }
-
 function partitionWithIndex_1(predicate) {
-  return map => {
-    const left = beginMutation_1(makeWith_1(map.config));
-    const right = beginMutation_1(makeWith_1(map.config));
+  return self => {
+    const left = beginMutation_1(makeWith_1(self.config));
+    const right = beginMutation_1(makeWith_1(self.config));
     forEachWithIndex_1((k, v) => {
       if (predicate(k, v)) {
         set_1(k, v)(right);
       } else {
         set_1(k, v)(left);
       }
-    })(map);
+    })(self);
     return [endMutation_1(left), endMutation_1(right)];
   };
 }
-
 function partition(predicate) {
-  return map => {
-    return partitionWithIndex_1((_, a) => predicate(a))(map);
+  return self => {
+    return partitionWithIndex_1((_, a) => predicate(a))(self);
   };
 }
 /**
@@ -642,25 +549,19 @@ function partition(predicate) {
  *
  * @tsplus pipeable fncts.HashMap foldLeftWithIndex
  */
-
-
 function foldLeftWithIndex_1(z, f) {
-  return map => {
-    const root = map.root;
+  return self => {
+    const root = self.root;
     if (root._tag === "LeafNode") return tsplus_module_3.isJust(root.value) ? f(root.key, z, root.value.value) : z;
-
     if (root._tag === "EmptyNode") {
       return z;
     }
-
     const toVisit = [root.children];
     let children;
     let acc = z;
-
     while (children = toVisit.pop()) {
       for (let i = 0, len = children.length; i < len;) {
         const child = children[i++];
-
         if (child && !(0, _internal.isEmptyNode)(child)) {
           if (child._tag === "LeafNode") {
             if (tsplus_module_3.isJust(child.value)) {
@@ -673,7 +574,6 @@ function foldLeftWithIndex_1(z, f) {
         }
       }
     }
-
     return acc;
   };
 }
@@ -682,38 +582,27 @@ function foldLeftWithIndex_1(z, f) {
  *
  * @tsplus pipeable fncts.HashMap foldLeft
  */
-
-
 function foldLeft(z, f) {
-  return map => {
-    return foldLeftWithIndex_1(z, (_, b, a) => f(b, a))(map);
+  return self => {
+    return foldLeftWithIndex_1(z, (_, b, a) => f(b, a))(self);
   };
 }
-
 function _traverseWithIndex_1(self) {
   return G => f => foldLeftWithIndex_1(G.pure(makeWith_1(self.config)), (k, b, a) => G.zipWith(f(k, a), (map, b) => set_1(k, b)(map))(b))(self);
 }
 /**
  * @tsplus getter fncts.HashMap traverse
  */
-
-
 function _traverse(self) {
   return G => f => _traverseWithIndex_1(self)(G)((_, a) => f(a));
 }
-
 const traverseWithIndex = G => f => ta => _traverseWithIndex_1(ta)(G)(f);
-
 exports.traverseWithIndex = traverseWithIndex;
-
 const traverse = G => f => ta => _traverseWithIndex_1(ta)(G)((_, a) => f(a));
 /**
  * @tsplus pipeable fncts.HashMap unsafeGet
  */
-
-
 exports.traverse = traverse;
-
 function unsafeGet(key) {
   return self => {
     return tsplus_module_7.toUndefined(getHash_1(key, self.config.hash(key))(self));
@@ -722,56 +611,38 @@ function unsafeGet(key) {
 /**
  * @tsplus getter fncts.HashMap witherWithIndex
  */
-
-
 function _witherWithIndex_1(self) {
   return G => f => G.map(compact_1)(_traverseWithIndex_1(self)(G)(f));
 }
 /**
  * @tsplus getter fncts.HashMap wither
  */
-
-
 function _wither(self) {
   return G => f => _witherWithIndex_1(self)(G)((_, a) => f(a));
 }
-
 const witherWithIndex = G => f => wa => _witherWithIndex_1(wa)(G)(f);
-
 exports.witherWithIndex = witherWithIndex;
-
 const wither = G => f => wa => _witherWithIndex_1(wa)(G)((_, a) => f(a));
 /**
  * @tsplus getter fncts.HashMap wiltWithIndex
  */
-
-
 exports.wither = wither;
-
 function _wiltWithIndex_1(self) {
   return G => f => G.map(separate_1)(_traverseWithIndex_1(self)(G)(f));
 }
 /**
  * @tsplus getter fncts.HashMap wilt
  */
-
-
 function _wilt(self) {
   return G => f => _wiltWithIndex_1(self)(G)((_, a) => f(a));
 }
-
 const wiltWithIndex = G => f => wa => _wiltWithIndex_1(wa)(G)(f);
-
 exports.wiltWithIndex = wiltWithIndex;
-
 const wilt = G => f => wa => _wiltWithIndex_1(wa)(G)((_, a) => f(a));
 /**
  * @tsplus pipeable fncts.HashMap unionWith
  */
-
-
 exports.wilt = wilt;
-
 function unionWith(that, f) {
   return self => {
     return mutate_1(m => {
@@ -784,8 +655,6 @@ function unionWith(that, f) {
 /**
  * @tsplus pipeable fncts.HashMap union
  */
-
-
 function union(that) {
   return self => {
     return mutate_1(m => {
@@ -798,90 +667,67 @@ function union(that) {
 /**
  * @tsplus pipeable fncts.HashMap pop
  */
-
-
 function pop(k) {
-  return map => {
-    return tsplus_module_7.map(a => [a, remove_1(k)(map)])(get_1(k)(map));
+  return self => {
+    return tsplus_module_7.map(a => [a, remove_1(k)(self)])(get_1(k)(self));
   };
 }
-/*
- * -------------------------------------------------------------------------------------------------
- * internal
- * -------------------------------------------------------------------------------------------------
- */
-
 /**
  * Set the root of the map
  */
-
-
 function setTree(map, newRoot, newSize) {
   if (map.editable) {
     map.root = newRoot;
     map.size = newSize;
     return map;
   }
-
   return newRoot === map.root ? map : new tsplus_module_1.HashMap(map.editable, map.edit, map.config, newRoot, newSize);
 }
 /**
  * Lookup the value for `key` in `map` using custom hash.
  */
-
-
 function tryGetHash(map, key, hash) {
   let node = map.root;
   let shift = 0;
-  const keyEq = map.config.equals; // eslint-disable-next-line no-constant-condition
-
+  const keyEq = map.config.equals;
+  // eslint-disable-next-line no-constant-condition
   while (true) {
     switch (node._tag) {
       case "LeafNode":
         {
-          return keyEq(node.key, key) ? node.value : tsplus_module_4.nothing();
+          return keyEq(key)(node.key) ? node.value : tsplus_module_4.nothing();
         }
-
       case "CollisionNode":
         {
           if (hash === node.hash) {
             const children = node.children;
-
             for (let i = 0, len = children.length; i < len; ++i) {
               const child = children[i];
-              if ("key" in child && keyEq(child.key, key)) return child.value;
+              if ("key" in child && keyEq(key)(child.key)) return child.value;
             }
           }
-
           return tsplus_module_4.nothing();
         }
-
       case "IndexedNode":
         {
           const frag = (0, _internal.hashFragment)(shift, hash);
           const bit = (0, _internal.toBitmap)(frag);
-
           if (node.mask & bit) {
             node = node.children[(0, _internal.fromBitmap)(node.mask, bit)];
             shift += _internal.SIZE;
             break;
           }
-
           return tsplus_module_4.nothing();
         }
-
       case "ArrayNode":
         {
           node = node.children[(0, _internal.hashFragment)(shift, hash)];
-
           if (node) {
             shift += _internal.SIZE;
             break;
           }
-
           return tsplus_module_4.nothing();
         }
-
       default:
         return tsplus_module_4.nothing();
     }