Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch to picocolors for console formatting #628

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
181 changes: 10 additions & 171 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
"ava": "^6.1.2",
"browserify": "^17.0.0",
"browserify-shim": "^3.8.16",
"cli-color": "^2.0.4",
"concurrently": "^8.2.2",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"picocolors": "^1.1.0",
"rimraf": "^5.0.5",
"shx": "^0.3.4",
"tsify": "^5.0.4",
Expand Down
27 changes: 14 additions & 13 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {basename, dirname, extname, normalize, sep, posix} from 'path'
import {Intersection, JSONSchema, LinkedJSONSchema, NormalizedJSONSchema, Parent} from './types/JSONSchema'
import {JSONSchema4} from 'json-schema'
import yaml from 'js-yaml'
import type {Format} from 'cli-color'

// TODO: pull out into a separate package
export function Try<T>(fn: () => T, err: (e: Error) => any): T {
Expand Down Expand Up @@ -243,7 +242,7 @@ export function log(style: LogStyle, title: string, ...messages: unknown[]): voi
if (messages.length > 1 && typeof messages[messages.length - 1] !== 'string') {
lastMessage = messages.splice(messages.length - 1, 1)
}
console.info(color()?.whiteBright.bgCyan('debug'), getStyledTextForLogging(style)?.(title), ...messages)
console.info(color()?.bgCyan(color()?.whiteBright('debug')), getStyledTextForLogging(style)?.(title), ...messages)
if (lastMessage) {
console.dir(lastMessage, {depth: 6, maxArrayLength: 6})
}
Expand All @@ -253,21 +252,23 @@ function getStyledTextForLogging(style: LogStyle): ((text: string) => string) |
if (!process.env.VERBOSE) {
return
}
const pc = color()
if (!pc) return
switch (style) {
case 'blue':
return color()?.whiteBright.bgBlue
return text => pc.bgBlue(pc.whiteBright(text))
case 'cyan':
return color()?.whiteBright.bgCyan
return text => pc.bgCyan(pc.whiteBright(text))
case 'green':
return color()?.whiteBright.bgGreen
return text => pc.bgGreen(pc.whiteBright(text))
case 'magenta':
return color()?.whiteBright.bgMagenta
return text => pc.bgMagenta(pc.whiteBright(text))
case 'red':
return color()?.whiteBright.bgRedBright
return text => pc.bgRedBright(pc.whiteBright(text))
case 'white':
return color()?.black.bgWhite
return text => pc.bgWhite(pc.black(text))
case 'yellow':
return color()?.whiteBright.bgYellow
return text => pc.bgYellow(pc.whiteBright(text))
}
}

Expand Down Expand Up @@ -413,10 +414,10 @@ function isYaml(filename: string) {
return filename.endsWith('.yaml') || filename.endsWith('.yml')
}

function color(): Format {
let cliColor
function color() {
let pc
try {
cliColor = require('cli-color')
pc = require('picocolors')
} catch {}
return cliColor
return pc
}