honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(dev-infra): add group functions to logging system and remove color param (#37232) 

Adds .group and .groupEnd functions to each of the logging functions
to allow creating groups in the logged output.  Additionally removes
the color parameter from logging functions, in favor of the color
being applied to the string at the call site.

PR Close #37232
This commit is contained in:
Joey Perrott 2020-05-20 14:19:10 -07:00 committed by Matias Niemelä
parent 87b1aeac0f
commit 52c7aae4df
1 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
dev-infra/utils/console.ts
View File

@ -44,56 +44,54 @@ export enum LOG_LEVELS {
export const DEFAULT_LOG_LEVEL = LOG_LEVELS.INFO; export const DEFAULT_LOG_LEVEL = LOG_LEVELS.INFO;
/** Write to the console for at INFO logging level */ /** Write to the console for at INFO logging level */
export function info(...text: string[]): void; export const info = buildLogLevelFunction(() => console.info, LOG_LEVELS.INFO);
export function info(color: typeof chalk, ...text: string[]): void;
export function info(color: typeof chalk|string, ...text: string[]) {
runConsoleCommand(console.info, LOG_LEVELS.INFO, color, ...text);
}
/** Write to the console for at ERROR logging level */ /** Write to the console for at ERROR logging level */
export function error(...text: string[]): void; export const error = buildLogLevelFunction(() => console.error, LOG_LEVELS.ERROR);
export function error(color: typeof chalk, ...text: string[]): void;
export function error(color: typeof chalk|string, ...text: string[]) {
runConsoleCommand(console.error, LOG_LEVELS.ERROR, color, ...text);
}
/** Write to the console for at DEBUG logging level */ /** Write to the console for at DEBUG logging level */
export function debug(...text: string[]): void; export const debug = buildLogLevelFunction(() => console.debug, LOG_LEVELS.DEBUG);
export function debug(color: typeof chalk, ...text: string[]): void;
export function debug(color: typeof chalk|string, ...text: string[]) {
runConsoleCommand(console.debug, LOG_LEVELS.DEBUG, color, ...text);
}
/** Write to the console for at LOG logging level */ /** Write to the console for at LOG logging level */
export function log(...text: string[]): void; // tslint:disable-next-line: no-console
export function log(color: typeof chalk, ...text: string[]): void; export const log = buildLogLevelFunction(() => console.log, LOG_LEVELS.LOG);
export function log(color: typeof chalk|string, ...text: string[]) {
// tslint:disable-next-line: no-console
runConsoleCommand(console.log, LOG_LEVELS.LOG, color, ...text);
}
/** Write to the console for at WARN logging level */ /** Write to the console for at WARN logging level */
export function warn(...text: string[]): void; export const warn = buildLogLevelFunction(() => console.warn, LOG_LEVELS.WARN);
export function warn(color: typeof chalk, ...text: string[]): void;
export function warn(color: typeof chalk|string, ...text: string[]) { /** Build an instance of a logging function for the provided level. */
runConsoleCommand(console.warn, LOG_LEVELS.WARN, color, ...text); function buildLogLevelFunction(loadCommand: () => Function, level: LOG_LEVELS) {
/** Write to stdout for the LOG_LEVEL. */
const loggingFunction = (...text: string[]) => {
runConsoleCommand(loadCommand, level, ...text);
};
/** Start a group at the LOG_LEVEL, optionally starting it as collapsed. */
loggingFunction.group = (text: string, collapsed = false) => {
const command = collapsed ? console.groupCollapsed : console.group;
runConsoleCommand(() => command, level, text);
};
/** End the group at the LOG_LEVEL. */
loggingFunction.groupEnd = () => {
runConsoleCommand(() => console.groupEnd, level);
};
return loggingFunction;
} }
/** /**
* Run the console command provided, if the environments logging level greater than the * Run the console command provided, if the environments logging level greater than the
* provided logging level. * provided logging level.
*
* The loadCommand takes in a function which is called to retrieve the console.* function
* to allow for jasmine spies to still work in testing. Without this method of retrieval
* the console.* function, the function is saved into the closure of the created logging
* function before jasmine can spy.
*/ */
function runConsoleCommand( function runConsoleCommand(loadCommand: () => Function, logLevel: LOG_LEVELS, ...text: string[]) {
command: Function, logLevel: LOG_LEVELS, color: typeof chalk|string, ...text: string[]) {
if (getLogLevel() >= logLevel) { if (getLogLevel() >= logLevel) {
if (typeof color === 'function') { loadCommand()(...text);
text = text.map(entry => color(entry));
} else {
text = [color as string, ...text];
}
for (const textEntry of text) {
command(textEntry);
}
} }
} }