Add alternate implementation of forEach

PythonCoderAS · PythonCoderAS · commit a237cf29aa45 · 2021-12-18T15:51:58.000-05:00
diff --git a/arrayStringMap.test.ts b/arrayStringMap.test.ts
@@ -250,7 +250,6 @@ describe("Map with two objects", () => {
     it("Map forEach is called twice", () => {
         let count = 0;
         arrayStringMap.forEach((value, key, map) => {
-            count++;
             assert(map === arrayStringMap, "Map is arrayStringMap");
             if (count === 0){
                 assert(key === sampleArray1, "Key is sampleArray1");
@@ -260,6 +259,7 @@ describe("Map with two objects", () => {
                 assert(key === sampleArray3, "Key is sampleArray3");
                 assert(value === sampleValue2, "Value is sampleValue2");
             }
+            count++;
         });
         assert(count === 2, "ForEach is called twice");
     })
diff --git a/arrayStringMap.ts b/arrayStringMap.ts
@@ -51,11 +51,9 @@ export default class ArrayStringMap<K extends any[], V> implements Map<K, V> {
     }
 
     forEach(callbackfn: (value: V, key: K, map: ArrayStringMap<K, V>) => void, thisArg?: any): void {
-        this._converterInfo.forEach((value, key) => {
-            // TypeScript complains that this will be undefined, but the items in
-            // `this._converterInfo` and `this._map` will always be defined in each other.
-            return callbackfn(this._map.get(key)!, value, thisArg);
-        });
+        for (const [key, value] of this.entries()) {
+            callbackfn.call(thisArg, value, key, this);
+        }
     }
 
     get(key: K): V | undefined {

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,9 @@ export default class ArrayStringMap<K extends any[], V> implements Map<K, V> {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`forEach(callbackfn: (value: V, key: K, map: ArrayStringMap<K, V>) => void, thisArg?: any): void {`
`54`		`- this._converterInfo.forEach((value, key) => {`
`55`		`- // TypeScript complains that this will be undefined, but the items in`
`56`		- // `this._converterInfo` and `this._map` will always be defined in each other.
`57`		`- return callbackfn(this._map.get(key)!, value, thisArg);`
`58`		`- });`
	`54`	`+ for (const [key, value] of this.entries()) {`
	`55`	`+ callbackfn.call(thisArg, value, key, this);`
	`56`	`+ }`
`59`	`57`	`}`
`60`	`58`
`61`	`59`	`get(key: K): V \| undefined {`