Skip to content

Commit

Permalink
Revert "fix(ext/console): fix inspecting iterators error. (denoland#2…
Browse files Browse the repository at this point in the history
…0720)" (denoland#21191)

This reverts commit 0209f7b.

Reverting because it causes failures on `main`:
denoland#20720 (comment)
  • Loading branch information
bartlomieju authored Nov 13, 2023
1 parent 9fed7b9 commit 9b9ec44
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 20 deletions.
13 changes: 9 additions & 4 deletions ext/console/01_console.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ const {
WeakSetPrototypeHas,
isNaN,
} = primordials;
import { previewEntries } from "ext:deno_node/internal_binding/util.ts";

let noColor = () => false;

Expand Down Expand Up @@ -1494,7 +1493,9 @@ function getIteratorBraces(type, tag) {

const iteratorRegExp = new SafeRegExp(" Iterator] {$");
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) {
// Mark entry iterators as such.
braces[0] = StringPrototypeReplace(
Expand Down Expand Up @@ -1703,12 +1704,16 @@ function formatWeakCollection(ctx) {
}

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);
}

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);
}

Expand Down
13 changes: 12 additions & 1 deletion ext/node/polyfills/internal/console/constructor.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,17 @@ import {
validateInteger,
validateObject,
} 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";
const { isBuffer } = Buffer;
import {
Expand Down Expand Up @@ -465,6 +475,7 @@ const consoleMethods = {

// https://console.spec.whatwg.org/#table
table(tabularData, properties) {
console.log("tabularData", tabularData);
if (properties !== undefined) {
validateArray(properties, "properties");
}
Expand Down
15 changes: 0 additions & 15 deletions ext/node/polyfills/internal_binding/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,3 @@ export function getOwnNonIndexProperties(
}
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];
}
}

0 comments on commit 9b9ec44

Please sign in to comment.