fix(ValueObject): fix types, param name

slikts · Feb 23, 2020 · 4789bad · 4789bad
1 parent 8714127
commit 4789bad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/DeepCompositeSymbol.ts b/src/DeepCompositeSymbol.ts
@@ -6,12 +6,12 @@ import { isObject } from './helpers';
  * an object's entries (key-value pairs).
  */
 // tslint:disable-next-line: variable-name
-const DeepCompositeSymbol = ((object: any, filter?: (entry: [string, any]) => boolean) => {
+const DeepCompositeSymbol = (object: any, filter?: (entry: [string, any]) => boolean) => {
   const entries = filter ? Object.entries(object).filter(filter) : Object.entries(object);
   // Recursively replace non-tuple object values with tuples
-  entries.forEach(x => update(x, filter));
+  entries.forEach(entry => update(entry, filter));
   return Tuple.unsafeSymbol(...flatten(entries));
-}) as any;
+};
 
 const update = (entry: any, filter?: any) => {
   const v = entry[1];

diff --git a/src/ValueObject.ts b/src/ValueObject.ts
@@ -5,8 +5,11 @@ import DeepCompositeSymbol from './DeepCompositeSymbol';
  * https://github.com/tc39/proposal-record-tuple
  */
 // tslint:disable-next-line: variable-name
-const ValueObject = <A extends object>(object: A, keyFilter?: (key: string) => boolean): A => {
-  const key = DeepCompositeSymbol(object, keyFilter);
+const ValueObject = <A extends object>(
+  object: A,
+  filter?: (entry: [string, any]) => boolean,
+): A => {
+  const key = DeepCompositeSymbol(object, filter);
   if (cache.has(key)) {
     return cache.get(key) as A;
   }