Commit 4bf58ac
util: update set iterator entries inspection
The inspection output for Set#entries() was wrong so far as it did
not return an array as it should have. That was a bug in V8 that is
now fixed and the code in Node.js has to be updated accordingly.
PR-URL: #25941
Fixes: #24629
Reviewed-By: Michaël Zasso <targos@protonmail.com>1 parent 206e4b0 commit 4bf58ac
3 files changed
Lines changed: 9 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -594,11 +594,11 @@ function formatRaw(ctx, value, recurseTimes, typedArray) { | |||
| 594 | 594 | } else if (isMapIterator(value)) { | |
| 595 | 595 | keys = getKeys(value, ctx.showHidden); | |
| 596 | 596 | braces = [`[${tag}] {`, '}']; | |
| 597 | - formatter = formatMapIterator; | ||
| 597 | + formatter = formatIterator; | ||
| 598 | 598 | } else if (isSetIterator(value)) { | |
| 599 | 599 | keys = getKeys(value, ctx.showHidden); | |
| 600 | 600 | braces = [`[${tag}] {`, '}']; | |
| 601 | - formatter = formatSetIterator; | ||
| 601 | + formatter = formatIterator; | ||
| 602 | 602 | } else { | |
| 603 | 603 | noIterator = true; | |
| 604 | 604 | } | |
@@ -730,10 +730,10 @@ function formatRaw(ctx, value, recurseTimes, typedArray) { | |||
| 730 | 730 | } | |
| 731 | 731 | if (isMapIterator(value)) { | |
| 732 | 732 | braces = [`[${tag || 'Map Iterator'}] {`, '}']; | |
| 733 | - formatter = formatMapIterator; | ||
| 733 | + formatter = formatIterator; | ||
| 734 | 734 | } else if (isSetIterator(value)) { | |
| 735 | 735 | braces = [`[${tag || 'Set Iterator'}] {`, '}']; | |
| 736 | - formatter = formatSetIterator; | ||
| 736 | + formatter = formatIterator; | ||
| 737 | 737 | // Handle other regular objects again. | |
| 738 | 738 | } else if (keys.length === 0) { | |
| 739 | 739 | if (isExternal(value)) | |
@@ -1090,12 +1090,7 @@ function formatWeakMap(ctx, value, recurseTimes) { | |||
| 1090 | 1090 | return formatMapIterInner(ctx, recurseTimes, entries, kWeak); | |
| 1091 | 1091 | } | |
| 1092 | 1092 | ||
| 1093 | - function formatSetIterator(ctx, value, recurseTimes) { | ||
| 1094 | - const entries = previewEntries(value); | ||
| 1095 | - return formatSetIterInner(ctx, recurseTimes, entries, kIterator); | ||
| 1096 | - } | ||
| 1097 | - | ||
| 1098 | - function formatMapIterator(ctx, value, recurseTimes) { | ||
| 1093 | + function formatIterator(ctx, value, recurseTimes) { | ||
| 1099 | 1094 | const [entries, isKeyValue] = previewEntries(value, true); | |
| 1100 | 1095 | if (isKeyValue) { | |
| 1101 | 1096 | return formatMapIterInner(ctx, recurseTimes, entries, kMapEntries); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -100,7 +100,7 @@ static void PreviewEntries(const FunctionCallbackInfo<Value>& args) { | |||
| 100 | 100 | Local<Array> entries; | |
| 101 | 101 | if (!args[0].As<Object>()->PreviewEntries(&is_key_value).ToLocal(&entries)) | |
| 102 | 102 | return; | |
| 103 | - // Fast path for WeakMap, WeakSet and Set iterators. | ||
| 103 | + // Fast path for WeakMap and WeakSet. | ||
| 104 | 104 | if (args.Length() == 1) | |
| 105 | 105 | return args.GetReturnValue().Set(entries); | |
| 106 | 106 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -995,7 +995,8 @@ if (typeof Symbol !== 'undefined') { | |||
| 995 | 995 | const aSet = new Set([1, 3]); | |
| 996 | 996 | assert.strictEqual(util.inspect(aSet.keys()), '[Set Iterator] { 1, 3 }'); | |
| 997 | 997 | assert.strictEqual(util.inspect(aSet.values()), '[Set Iterator] { 1, 3 }'); | |
| 998 | - assert.strictEqual(util.inspect(aSet.entries()), '[Set Iterator] { 1, 3 }'); | ||
| 998 | + assert.strictEqual(util.inspect(aSet.entries()), | ||
| 999 | + '[Set Iterator] { [ 1, 1 ], [ 3, 3 ] }'); | ||
| 999 | 1000 | // Make sure the iterator doesn't get consumed. | |
| 1000 | 1001 | const keys = aSet.keys(); | |
| 1001 | 1002 | assert.strictEqual(util.inspect(keys), '[Set Iterator] { 1, 3 }'); | |
@@ -1609,7 +1610,7 @@ assert.strictEqual(util.inspect('"\'${a}'), "'\"\\'${a}'"); | |||
| 1609 | 1610 | [{ a: 5 }, '{ a: 5 }'], | |
| 1610 | 1611 | [new Set([1, 2]), 'Set { 1, 2 }'], | |
| 1611 | 1612 | [new Map([[1, 2]]), 'Map { 1 => 2 }'], | |
| 1612 | - [new Set([1, 2]).entries(), '[Set Iterator] { 1, 2 }'], | ||
| 1613 | + [new Set([1, 2]).entries(), '[Set Iterator] { [ 1, 1 ], [ 2, 2 ] }'], | ||
| 1613 | 1614 | [new Map([[1, 2]]).keys(), '[Map Iterator] { 1 }'], | |
| 1614 | 1615 | [new Date(2000), '1970-01-01T00:00:02.000Z'], | |
| 1615 | 1616 | [new Uint8Array(2), 'Uint8Array [ 0, 0 ]'], | |
0 commit comments