Skip to content

Commit

Permalink
debugger: refactor to use internal modules
Browse files Browse the repository at this point in the history
This avoids loading the entirety of `node:util` and `node:url` and their
dependencies while only a subset is actually used by this module.

PR-URL: #38550
Backport-PR-URL: #39446
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
  • Loading branch information
aduh95 authored and richardlau committed Jul 22, 2021
1 parent b5724a1 commit ad80566
Showing 1 changed file with 17 additions and 16 deletions.
33 changes: 17 additions & 16 deletions lib/internal/inspector/inspect_repl.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
const FS = require('fs');
const Path = require('path');
const Repl = require('repl');
const util = require('util');
const vm = require('vm');
const fileURLToPath = require('url').fileURLToPath;
const { fileURLToPath } = require('internal/url');

const debuglog = util.debuglog('inspect');
const { customInspectSymbol } = require('internal/util');
const { inspect: utilInspect } = require('internal/util/inspect');
const debuglog = require('internal/util/debuglog').debuglog('inspect');

const SHORTCUTS = {
cont: 'c',
Expand Down Expand Up @@ -148,12 +149,12 @@ class RemoteObject {
}
}

[util.inspect.custom](depth, opts) {
[customInspectSymbol](depth, opts) {
function formatProperty(prop) {
switch (prop.type) {
case 'string':
case 'undefined':
return util.inspect(prop.value, opts);
return utilInspect(prop.value, opts);

case 'number':
case 'boolean':
Expand All @@ -162,7 +163,7 @@ class RemoteObject {
case 'object':
case 'symbol':
if (prop.subtype === 'date') {
return util.inspect(new Date(prop.value), opts);
return utilInspect(new Date(prop.value), opts);
}
if (prop.subtype === 'array') {
return opts.stylize(prop.value, 'special');
Expand All @@ -178,7 +179,7 @@ class RemoteObject {
case 'number':
case 'string':
case 'undefined':
return util.inspect(this.value, opts);
return utilInspect(this.value, opts);

case 'symbol':
return opts.stylize(this.description, 'special');
Expand All @@ -192,10 +193,10 @@ class RemoteObject {
case 'object':
switch (this.subtype) {
case 'date':
return util.inspect(new Date(this.description), opts);
return utilInspect(new Date(this.description), opts);

case 'null':
return util.inspect(null, opts);
return utilInspect(null, opts);

case 'regexp':
return opts.stylize(this.description, 'regexp');
Expand Down Expand Up @@ -243,11 +244,11 @@ class ScopeSnapshot {
this.completionGroup = properties.map((prop) => prop.name);
}

[util.inspect.custom](depth, opts) {
[customInspectSymbol](depth, opts) {
const type = `${this.type[0].toUpperCase()}${this.type.slice(1)}`;
const name = this.name ? `<${this.name}>` : '';
const prefix = `${type}${name} `;
return util.inspect(this.properties, opts)
return utilInspect(this.properties, opts)
.replace(/^Map /, prefix);
}
}
Expand Down Expand Up @@ -296,7 +297,7 @@ function createRepl(inspector) {

const INSPECT_OPTIONS = { colors: inspector.stdout.isTTY };
function inspect(value) {
return util.inspect(value, INSPECT_OPTIONS);
return utilInspect(value, INSPECT_OPTIONS);
}

function print(value, addNewline = true) {
Expand Down Expand Up @@ -336,7 +337,7 @@ function createRepl(inspector) {
function listScripts(displayNatives = false) {
print(formatScripts(displayNatives));
}
listScripts[util.inspect.custom] = function listWithoutInternal() {
listScripts[customInspectSymbol] = function listWithoutInternal() {
return formatScripts();
};

Expand All @@ -352,7 +353,7 @@ function createRepl(inspector) {
return p;
}

[util.inspect.custom](depth, { stylize }) {
[customInspectSymbol](depth, { stylize }) {
const { startTime, endTime } = this.data;
const MU = String.fromChar(956);
return stylize(`[Profile ${endTime - startTime}${MU}s]`, 'special');
Expand All @@ -373,7 +374,7 @@ function createRepl(inspector) {
this.delta = delta;
}

[util.inspect.custom](depth, options) {
[customInspectSymbol](depth, options) {
const { scriptId, lineNumber, columnNumber, delta, scriptSource } = this;
const start = Math.max(1, lineNumber - delta + 1);
const end = lineNumber + delta + 1;
Expand Down Expand Up @@ -439,7 +440,7 @@ function createRepl(inspector) {
}

class Backtrace extends Array {
[util.inspect.custom]() {
[customInspectSymbol]() {
return this.map((callFrame, idx) => {
const {
location: { scriptId, lineNumber, columnNumber },
Expand Down

0 comments on commit ad80566

Please sign in to comment.