chore: address code review

nodejs · Nov 5, 2020 · 0b30bc2 · 0b30bc2
1 parent 6434455
commit 0b30bc2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/lib/internal/source_map/source_map_cache.js b/lib/internal/source_map/source_map_cache.js
@@ -212,7 +212,7 @@ function sourceMapCacheToObject() {
 }
 
 function appendCJSCache(obj) {
-  for (const [, value] of cjsSourceMapCache) {
+  for (const value of cjsSourceMapCache) {
     obj[ObjectGetValueSafe(value, 'filename')] = {
       lineLengths: ObjectGetValueSafe(value, 'lineLengths'),
       data: ObjectGetValueSafe(value, 'data'),
@@ -230,7 +230,7 @@ function findSourceMap(sourceURL) {
   }
   let sourceMap = esmSourceMapCache.get(sourceURL);
   if (sourceMap === undefined) {
-    for (const [, value] of cjsSourceMapCache) {
+    for (const value of cjsSourceMapCache) {
       const filename = ObjectGetValueSafe(value, 'filename');
       if (sourceURL === filename) {
         sourceMap = {

diff --git a/lib/internal/util/iterable_weak_map.js b/lib/internal/util/iterable_weak_map.js
@@ -2,6 +2,7 @@
 
 const {
   makeSafe,
+  Object,
   SafeSet,
   SafeWeakMap,
   Symbol,
@@ -49,6 +50,10 @@ class IterableWeakMap {
     return this.#weakMap.get(key)?.value;
   }
 
+  has(key) {
+    return this.#weakMap.has(key);
+  }
+
   delete(key) {
     const entry = this.#weakMap.get(key);
     if (!entry) {
@@ -65,12 +70,6 @@ class IterableWeakMap {
       const key = ref.deref();
       if (!key) continue;
       const { value } = this.#weakMap.get(key);
-      yield [key, value];
-    }
-  }
-
-  *values() {
-    for (const [, value] of this) {
       yield value;
     }
   }
@@ -80,6 +79,8 @@ function cleanup({ set, ref }) {
   set.delete(ref);
 }
 
+Object.freeze(IterableWeakMap.prototype);
+
 module.exports = {
   IterableWeakMap
 };
diff --git a/test/parallel/test-internal-iterable-weak-map.js b/test/parallel/test-internal-iterable-weak-map.js
@@ -20,7 +20,7 @@ const { IterableWeakMap } = require('internal/util/iterable_weak_map');
   setImmediate(() => {
     _cache;
     globalThis.gc();
-    const values = [...wm.values()];
+    const values = [...wm];
     deepStrictEqual(values, ['hello', 'goodbye']);
   });
 }
@@ -35,7 +35,7 @@ const { IterableWeakMap } = require('internal/util/iterable_weak_map');
   wm.set(_cache.moduleA, 'hello');
   wm.set(_cache.moduleB, 'goodbye');
   wm.set(_cache.moduleB, 'goodnight');
-  const values = [...wm.values()];
+  const values = [...wm];
   deepStrictEqual(values, ['hello', 'goodnight']);
 }
 
@@ -51,7 +51,7 @@ const { IterableWeakMap } = require('internal/util/iterable_weak_map');
   wm.set(_cache.moduleB, 'discard');
   wm.set(_cache.moduleC, 'goodbye');
   wm.delete(_cache.moduleB);
-  const values = [...wm.values()];
+  const values = [...wm];
   deepStrictEqual(values, ['hello', 'goodbye']);
 }
 
@@ -66,7 +66,7 @@ const { IterableWeakMap } = require('internal/util/iterable_weak_map');
   wm.set(_cache.moduleA, 'hello');
   wm.set(_cache.moduleC, 'goodbye');
   wm.delete(_cache.moduleB);
-  const values = [...wm.values()];
+  const values = [...wm];
   deepStrictEqual(values, ['hello', 'goodbye']);
 }
 
@@ -83,3 +83,13 @@ const { IterableWeakMap } = require('internal/util/iterable_weak_map');
   wm.set(_cache.moduleC, 'goodbye');
   strictEqual(wm.get(_cache.moduleB), 'discard');
 }
+
+// It returns true for has() if key exists.
+{
+  const wm = new IterableWeakMap();
+  const _cache = {
+    moduleA: {},
+  };
+  wm.set(_cache.moduleA, 'hello');
+  strictEqual(wm.has(_cache.moduleA), true);
+}