foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-24 08:09:08 -05:00
Code Issues Packages 1 Wiki Activity

Revert "fix(ext/console): fix inspecting iterators error. (#20720)" (#21191)

Browse source 
This reverts commit 0209f7b469.

Reverting because it causes failures on `main`:
https://github.com/denoland/deno/pull/20720#issuecomment-1809166755
This commit is contained in:
Bartek Iwańczuk 2023-11-13 23:16:23 +01:00 committed by GitHub
parent 9fed7b9caf
commit 9b9ec44db7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/console/01_console.js
View file

@ -136,7 +136,6 @@ const {
WeakSetPrototypeHas, WeakSetPrototypeHas,
isNaN, isNaN,
} = primordials; } = primordials;
import { previewEntries } from "ext:deno_node/internal_binding/util.ts";
let noColor = () => false; let noColor = () => false;
@ -1494,7 +1493,9 @@ function getIteratorBraces(type, tag) {
const iteratorRegExp = new SafeRegExp(" Iterator] {$"); const iteratorRegExp = new SafeRegExp(" Iterator] {$");
function formatIterator(braces, ctx, value, recurseTimes) { function formatIterator(braces, ctx, value, recurseTimes) {
const { 0: entries, 1: isKeyValue } = previewEntries(value, true); // TODO(wafuwafu13): Implement
// const { 0: entries, 1: isKeyValue } = previewEntries(value, true);
const { 0: entries, 1: isKeyValue } = value;
if (isKeyValue) { if (isKeyValue) {
// Mark entry iterators as such. // Mark entry iterators as such.
braces[0] = StringPrototypeReplace( braces[0] = StringPrototypeReplace(
@ -1703,12 +1704,16 @@ function formatWeakCollection(ctx) {
} }
function formatWeakSet(ctx, value, recurseTimes) { function formatWeakSet(ctx, value, recurseTimes) {
const entries = previewEntries(value); // TODO(wafuwafu13): Implement
// const entries = previewEntries(value);
const entries = value;
return formatSetIterInner(ctx, recurseTimes, entries, kWeak); return formatSetIterInner(ctx, recurseTimes, entries, kWeak);
} }
function formatWeakMap(ctx, value, recurseTimes) { function formatWeakMap(ctx, value, recurseTimes) {
const entries = previewEntries(value); // TODO(wafuwafu13): Implement
// const entries = previewEntries(value);
const entries = value;
return formatMapIterInner(ctx, recurseTimes, entries, kWeak); return formatMapIterInner(ctx, recurseTimes, entries, kWeak);
} }

13
ext/node/polyfills/internal/console/constructor.mjs
View file

@ -17,7 +17,17 @@ import {
validateInteger, validateInteger,
validateObject, validateObject,
} from "ext:deno_node/internal/validators.mjs"; } from "ext:deno_node/internal/validators.mjs";
import { previewEntries } from "ext:deno_node/internal_binding/util.ts"; const previewEntries = (iter, isKeyValue) => {
if (isKeyValue) {
const arr = [...iter];
if (Array.isArray(arr[0]) && arr[0].length === 2) {
return [[].concat(...arr), true];
}
return [arr, false];
} else {
return [...iter];
}
};
import { Buffer } from "node:buffer"; import { Buffer } from "node:buffer";
const { isBuffer } = Buffer; const { isBuffer } = Buffer;
import { import {
@ -465,6 +475,7 @@ const consoleMethods = {
// https://console.spec.whatwg.org/#table // https://console.spec.whatwg.org/#table
table(tabularData, properties) { table(tabularData, properties) {
console.log("tabularData", tabularData);
if (properties !== undefined) { if (properties !== undefined) {
validateArray(properties, "properties"); validateArray(properties, "properties");
} }

15
ext/node/polyfills/internal_binding/util.ts
View file

@ -129,18 +129,3 @@ export function getOwnNonIndexProperties(
} }
return result; return result;
} }
export function previewEntries(
iter: Iterable<unknown>,
isKeyValue?: boolean,
): Array<unknown | boolean> {
if (isKeyValue) {
const arr = [...iter];
if (Array.isArray(arr[0]) && arr[0].length === 2) {
return [([] as unknown[]).concat(...arr), true];
}
return [arr, false];
} else {
return [...iter];
}
}