1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-22 15:06:54 -05:00

Improve pretty printing of objects

If an object has more than 5 elements, it is printed in abbeviated form
displaying only the keys. This is useful in the REPL when inspecting
large objects like the Deno namespace:

  > Deno
  { args, noColor, pid, env, exit, isTTY, execPath, chdir, cwd, File,
  open, stdin, stdout, stderr, read, write, seek, close, copy,
  toAsyncIterator, SeekMode, Buffer, readAll, mkdirSync, mkdir,
  makeTempDirSync, makeTempDir, chmodSync, chmod, removeSync, remove,
  renameSync, rename, readFileSync, readFile, readDirSync, readDir,
  copyFileSync, copyFile, readlinkSync, readlink, statSync, lstatSync,
  stat, lstat, symlinkSync, symlink, writeFileSync, writeFile, ErrorKind,
  DenoError, libdeno, permissions, revokePermission, truncateSync,
  truncate, connect, dial, listen, metrics, resources, run, Process,
  inspect, build, platform, version, Console, stringifyArgs,
  DomIterableMixin }
This commit is contained in:
Ryan Dahl 2019-03-19 12:15:01 -04:00
parent 4c831f1eb5
commit 8f334ae568
2 changed files with 19 additions and 9 deletions

View file

@ -19,6 +19,10 @@ type ConsoleOptions = Partial<{
// Default depth of logging nested objects // Default depth of logging nested objects
const DEFAULT_MAX_DEPTH = 4; const DEFAULT_MAX_DEPTH = 4;
// Number of elements an object must have before it's displayed in appreviated
// form.
const OBJ_ABBREVIATE_SIZE = 5;
// Char codes // Char codes
const CHAR_PERCENT = 37; /* % */ const CHAR_PERCENT = 37; /* % */
const CHAR_LOWERCASE_S = 115; /* s */ const CHAR_LOWERCASE_S = 115; /* s */
@ -272,7 +276,6 @@ function createRawObjectString(
} }
ctx.add(value); ctx.add(value);
const entries: string[] = [];
let baseString = ""; let baseString = "";
const className = getClassInstanceName(value); const className = getClassInstanceName(value);
@ -280,12 +283,19 @@ function createRawObjectString(
if (className && className !== "Object" && className !== "anonymous") { if (className && className !== "Object" && className !== "anonymous") {
shouldShowClassName = true; shouldShowClassName = true;
} }
const keys = Object.keys(value);
for (const key of Object.keys(value)) { const entries: string[] = keys.map(key => {
entries.push( if (keys.length > OBJ_ABBREVIATE_SIZE) {
`${key}: ${stringifyWithQuotes(value[key], ctx, level + 1, maxLevel)}` return key;
); } else {
} return `${key}: ${stringifyWithQuotes(
value[key],
ctx,
level + 1,
maxLevel
)}`;
}
});
ctx.delete(value); ctx.delete(value);

View file

@ -72,7 +72,7 @@ test(function consoleTestStringifyCircular() {
}; };
nestedObj.o = circularObj; nestedObj.o = circularObj;
const nestedObjExpected = `{ num: 1, bool: true, str: "a", method: [Function: method], asyncMethod: [AsyncFunction: asyncMethod], generatorMethod: [GeneratorFunction: generatorMethod], un: undefined, nu: null, arrowFunc: [Function: arrowFunc], extendedClass: Extended { a: 1, b: 2 }, nFunc: [Function], extendedCstr: [Function: Extended], o: { num: 2, bool: false, str: "b", method: [Function: method], un: undefined, nu: null, nested: [Circular], emptyObj: {}, arr: [ 1, "s", false, null, [Circular] ], baseClass: Base { a: 1 } } }`; const nestedObjExpected = `{ num, bool, str, method, asyncMethod, generatorMethod, un, nu, arrowFunc, extendedClass, nFunc, extendedCstr, o }`;
assertEquals(stringify(1), "1"); assertEquals(stringify(1), "1");
assertEquals(stringify(1n), "1n"); assertEquals(stringify(1n), "1n");
@ -114,7 +114,7 @@ test(function consoleTestStringifyCircular() {
assertEquals(stringify(JSON), "{}"); assertEquals(stringify(JSON), "{}");
assertEquals( assertEquals(
stringify(console), stringify(console),
"Console { printFunc: [Function], log: [Function], debug: [Function], info: [Function], dir: [Function], warn: [Function], error: [Function], assert: [Function], count: [Function], countReset: [Function], table: [Function], time: [Function], timeLog: [Function], timeEnd: [Function], group: [Function], groupCollapsed: [Function], groupEnd: [Function], clear: [Function], indentLevel: 0, collapsedAt: null }" "Console { printFunc, log, debug, info, dir, warn, error, assert, count, countReset, table, time, timeLog, timeEnd, group, groupCollapsed, groupEnd, clear, indentLevel, collapsedAt }"
); );
// test inspect is working the same // test inspect is working the same
assertEquals(inspect(nestedObj), nestedObjExpected); assertEquals(inspect(nestedObj), nestedObjExpected);