summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2023-11-13 23:16:23 +0100
committerGitHub <noreply@github.com>2023-11-13 22:16:23 +0000
commit9b9ec44db7eeec9d390b63f93393578e258f05a0 (patch)
tree45b868369dde5b145f712d137c0e4b3972d2f458 /ext
parent9fed7b9caf901a2b5f78e345ad327dd5cc48e02f (diff)
Revert "fix(ext/console): fix inspecting iterators error. (#20720)" (#21191)
This reverts commit 0209f7b46954d1b7bf923b4191e5a356ec09622c. Reverting because it causes failures on `main`: https://github.com/denoland/deno/pull/20720#issuecomment-1809166755
Diffstat (limited to 'ext')
-rw-r--r--ext/console/01_console.js13
-rw-r--r--ext/node/polyfills/internal/console/constructor.mjs13
-rw-r--r--ext/node/polyfills/internal_binding/util.ts15
3 files changed, 21 insertions, 20 deletions
diff --git a/ext/console/01_console.js b/ext/console/01_console.js
index b3624ea7c..67c75f74d 100644
--- a/ext/console/01_console.js
+++ b/ext/console/01_console.js
@@ -136,7 +136,6 @@ const {
WeakSetPrototypeHas,
isNaN,
} = primordials;
-import { previewEntries } from "ext:deno_node/internal_binding/util.ts";
let noColor = () => false;
@@ -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(
@@ -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);
}
diff --git a/ext/node/polyfills/internal/console/constructor.mjs b/ext/node/polyfills/internal/console/constructor.mjs
index afa18bb97..5ea9eeb3a 100644
--- a/ext/node/polyfills/internal/console/constructor.mjs
+++ b/ext/node/polyfills/internal/console/constructor.mjs
@@ -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 {
@@ -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");
}
diff --git a/ext/node/polyfills/internal_binding/util.ts b/ext/node/polyfills/internal_binding/util.ts
index 651fe9a4b..38eeebee0 100644
--- a/ext/node/polyfills/internal_binding/util.ts
+++ b/ext/node/polyfills/internal_binding/util.ts
@@ -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];
- }
-}