@fncts/base 0.0.21 → 0.0.23

package/_mjs/collection/immutable/HashMap/api.mjs

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "@fncts/base/collection/immutable/HashMap/definition";
-import * as tsplus_module_2 from "@fncts/base/typeclass/HashEq";
+import * as tsplus_module_2 from "@fncts/base/data/HashEq";
 import * as tsplus_module_3 from "@fncts/base/data/Maybe/definition";
 import * as tsplus_module_4 from "@fncts/base/data/Maybe/constructors";
 import * as tsplus_module_5 from "@fncts/base/collection/immutable/HashSet/api";
@@ -9,7 +9,7 @@ import * as tsplus_module_8 from "@fncts/base/data/function/api";
 import * as tsplus_module_9 from "@fncts/base/data/Either/destructors";
 import * as tsplus_module_10 from "@fncts/base/data/Maybe/destructors";
 export const makeWith = makeWith_1;
-export const makeDefault = makeDefault_1;
+export const empty = empty_1;
 export const getHash = getHash_1;
 export const get = get_1;
 export const modifyHash = modifyHash_1;
@@ -44,38 +44,33 @@ import * as P from "@fncts/base/typeclass";
  *
  * @tsplus getter fncts.HashMap isEmpty
  */
-
-export function isEmpty(map) {
-  return map && isEmptyNode(map.root);
+export function isEmpty(self) {
+  return self && 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, _EmptyNode, 0);
 }
 /**
  * @tsplus static fncts.HashMapOps __call
  */
-
-
 export 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);
 }
 /**
@@ -83,19 +78,16 @@ function makeDefault_1() {
  *
  * @tsplus pipeable fncts.HashMapOps fromFoldable
  */
-
-
 export 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);
   };
 }
 /**
@@ -103,10 +95,9 @@ export 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);
   };
 }
 /**
@@ -114,23 +105,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
  */
-
-
 export 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));
   };
 }
 /**
@@ -138,10 +125,9 @@ export function hasHash(key, hash) {
  *
  * @tsplus pipeable fncts.HashMap has
  */
-
 export 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)));
   };
 }
 /**
@@ -155,14 +141,13 @@ export 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);
   };
 }
 /**
@@ -176,11 +161,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);
   };
 }
 /**
@@ -188,11 +171,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);
   };
 }
 /**
@@ -200,11 +181,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);
   };
 }
 /**
@@ -212,15 +191,13 @@ function remove_1(key) {
  *
  * @tsplus pipeable fncts.HashMap removeMany
  */
-
-
 export function removeMany(keys) {
-  return map => {
+  return self => {
     return mutate_1(m => {
       for (const k of keys) {
         remove_1(k)(m);
       }
-    })(map);
+    })(self);
   };
 }
 /**
@@ -228,31 +205,26 @@ export 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);
   };
@@ -262,48 +234,43 @@ function mutate_1(f) {
  *
  * @tsplus getter fncts.HashMap keys
  */
-
-
-export function keys(map) {
-  return new HashMapIterator(map, ([k]) => k);
+export function keys(self) {
+  return new HashMapIterator(self, ([k]) => k);
 }
 /**
  * Get the set of keys
  *
  * @tsplus getter fncts.HashMap keySet
  */
-
 export 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
  */
-
-export function toSetDefault(map) {
+export 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
  */
-
-export function toList(map) {
+export function toList(self) {
   const buffer = new tsplus_module_6.ListBuffer();
   forEachWithIndex_1((k, v) => {
     buffer.append([k, v]);
-  })(map);
+  })(self);
   return buffer.toList;
 }
 /**
@@ -311,14 +278,13 @@ export function toList(map) {
  *
  * @tsplus getter fncts.HashMap toArray
  */
-
-export function toArray(map) {
-  const buffer = Array(map.size);
+export function toArray(self) {
+  const buffer = Array(self.size);
   let i = 0;
   forEachWithIndex_1((k, v) => {
     buffer[i] = [k, v];
     i++;
-  })(map);
+  })(self);
   return buffer;
 }
 /**
@@ -326,19 +292,17 @@ export function toArray(map) {
  *
  * @tsplus getter fncts.HashMap values
  */
-
-export function values(map) {
-  return new HashMapIterator(map, ([, v]) => v);
+export function values(self) {
+  return new HashMapIterator(self, ([, v]) => v);
 }
 /**
  * Update a value if exists
  *
  * @tsplus pipeable fncts.HashMap update
  */
-
 export 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);
   };
 }
 /**
@@ -346,10 +310,9 @@ export 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);
   };
 }
 /**
@@ -357,11 +320,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);
   };
 }
 /**
@@ -369,11 +330,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);
   };
 }
 /**
@@ -381,11 +340,9 @@ function mapWithIndex_1(f) {
  *
  * @tsplus pipeable fncts.HashMap map
  */
-
-
 export function map(f) {
-  return fa => {
-    return mapWithIndex_1((_, a) => f(a))(fa);
+  return self => {
+    return mapWithIndex_1((_, a) => f(a))(self);
   };
 }
 /**
@@ -393,14 +350,13 @@ export 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);
   };
 }
 /**
@@ -408,11 +364,9 @@ function flatMapWithIndex_1(f) {
  *
  * @tsplus pipeable fncts.HashMap flatMap
  */
-
-
 export function flatMap(f) {
-  return ma => {
-    return flatMapWithIndex_1((_, a) => f(a))(ma);
+  return self => {
+    return flatMapWithIndex_1((_, a) => f(a))(self);
   };
 }
 /**
@@ -420,38 +374,32 @@ export 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));
   };
 }
 /**
@@ -459,78 +407,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));
   };
 }
-
 export 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)];
   };
 }
-
 export function partition(predicate) {
-  return map => {
-    return partitionWithIndex_1((_, a) => predicate(a))(map);
+  return self => {
+    return partitionWithIndex_1((_, a) => predicate(a))(self);
   };
 }
 /**
@@ -538,24 +477,19 @@ export 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 && !isEmptyNode(child)) {
           if (child._tag === "LeafNode") {
             if (tsplus_module_3.isJust(child.value)) {
@@ -568,7 +502,6 @@ function foldLeftWithIndex_1(z, f) {
         }
       }
     }
-
     return acc;
   };
 }
@@ -577,22 +510,17 @@ function foldLeftWithIndex_1(z, f) {
  *
  * @tsplus pipeable fncts.HashMap foldLeft
  */
-
-
 export 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
  */
-
-
 export function _traverse(self) {
   return G => f => _traverseWithIndex_1(self)(G)((_, a) => f(a));
 }
@@ -601,7 +529,6 @@ export const traverse = G => f => ta => _traverseWithIndex_1(ta)(G)((_, a) => f(
 /**
  * @tsplus pipeable fncts.HashMap unsafeGet
  */
-
 export function unsafeGet(key) {
   return self => {
     return tsplus_module_7.toUndefined(getHash_1(key, self.config.hash(key))(self));
@@ -610,15 +537,12 @@ export 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
  */
-
-
 export function _wither(self) {
   return G => f => _witherWithIndex_1(self)(G)((_, a) => f(a));
 }
@@ -627,15 +551,12 @@ export const wither = G => f => wa => _witherWithIndex_1(wa)(G)((_, a) => f(a));
 /**
  * @tsplus getter fncts.HashMap wiltWithIndex
  */
-
 function _wiltWithIndex_1(self) {
   return G => f => G.map(separate_1)(_traverseWithIndex_1(self)(G)(f));
 }
 /**
  * @tsplus getter fncts.HashMap wilt
  */
-
-
 export function _wilt(self) {
   return G => f => _wiltWithIndex_1(self)(G)((_, a) => f(a));
 }
@@ -644,7 +565,6 @@ export const wilt = G => f => wa => _wiltWithIndex_1(wa)(G)((_, a) => f(a));
 /**
  * @tsplus pipeable fncts.HashMap unionWith
  */
-
 export function unionWith(that, f) {
   return self => {
     return mutate_1(m => {
@@ -657,7 +577,6 @@ export function unionWith(that, f) {
 /**
  * @tsplus pipeable fncts.HashMap union
  */
-
 export function union(that) {
   return self => {
     return mutate_1(m => {
@@ -670,88 +589,67 @@ export function union(that) {
 /**
  * @tsplus pipeable fncts.HashMap pop
  */
-
 export 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 = hashFragment(shift, hash);
           const bit = toBitmap(frag);
-
           if (node.mask & bit) {
             node = node.children[fromBitmap(node.mask, bit)];
             shift += SIZE;
             break;
           }
-
           return tsplus_module_4.nothing();
         }
-
       case "ArrayNode":
         {
           node = node.children[hashFragment(shift, hash)];
-
           if (node) {
             shift += SIZE;
             break;
           }
-
           return tsplus_module_4.nothing();
         }
-
       default:
         return tsplus_module_4.nothing();
     }