@@ -3,7 +3,6 @@ import {basename, dirname, extname, normalize, sep, posix} from 'path'
3
3
import { Intersection , JSONSchema , LinkedJSONSchema , NormalizedJSONSchema , Parent } from './types/JSONSchema'
4
4
import { JSONSchema4 } from 'json-schema'
5
5
import yaml from 'js-yaml'
6
- import type { Format } from 'cli-color'
7
6
8
7
// TODO: pull out into a separate package
9
8
export function Try < T > ( fn : ( ) => T , err : ( e : Error ) => any ) : T {
@@ -243,7 +242,7 @@ export function log(style: LogStyle, title: string, ...messages: unknown[]): voi
243
242
if ( messages . length > 1 && typeof messages [ messages . length - 1 ] !== 'string' ) {
244
243
lastMessage = messages . splice ( messages . length - 1 , 1 )
245
244
}
246
- console . info ( color ( ) ?. whiteBright . bgCyan ( 'debug' ) , getStyledTextForLogging ( style ) ?.( title ) , ...messages )
245
+ console . info ( color ( ) ?. bgCyan ( color ( ) ?. whiteBright ( 'debug' ) ) , getStyledTextForLogging ( style ) ?.( title ) , ...messages )
247
246
if ( lastMessage ) {
248
247
console . dir ( lastMessage , { depth : 6 , maxArrayLength : 6 } )
249
248
}
@@ -253,21 +252,23 @@ function getStyledTextForLogging(style: LogStyle): ((text: string) => string) |
253
252
if ( ! process . env . VERBOSE ) {
254
253
return
255
254
}
255
+ const pc = color ( )
256
+ if ( ! pc ) return
256
257
switch ( style ) {
257
258
case 'blue' :
258
- return color ( ) ? .whiteBright . bgBlue
259
+ return text => pc . bgBlue ( pc . whiteBright ( text ) )
259
260
case 'cyan' :
260
- return color ( ) ? .whiteBright . bgCyan
261
+ return text => pc . bgCyan ( pc . whiteBright ( text ) )
261
262
case 'green' :
262
- return color ( ) ? .whiteBright . bgGreen
263
+ return text => pc . bgGreen ( pc . whiteBright ( text ) )
263
264
case 'magenta' :
264
- return color ( ) ? .whiteBright . bgMagenta
265
+ return text => pc . bgMagenta ( pc . whiteBright ( text ) )
265
266
case 'red' :
266
- return color ( ) ? .whiteBright . bgRedBright
267
+ return text => pc . bgRedBright ( pc . whiteBright ( text ) )
267
268
case 'white' :
268
- return color ( ) ? .black . bgWhite
269
+ return text => pc . bgWhite ( pc . black ( text ) )
269
270
case 'yellow' :
270
- return color ( ) ? .whiteBright . bgYellow
271
+ return text => pc . bgYellow ( pc . whiteBright ( text ) )
271
272
}
272
273
}
273
274
@@ -413,10 +414,10 @@ function isYaml(filename: string) {
413
414
return filename . endsWith ( '.yaml' ) || filename . endsWith ( '.yml' )
414
415
}
415
416
416
- function color ( ) : Format {
417
- let cliColor
417
+ function color ( ) {
418
+ let pc
418
419
try {
419
- cliColor = require ( 'cli-color ' )
420
+ pc = require ( 'picocolors ' )
420
421
} catch { }
421
- return cliColor
422
+ return pc
422
423
}
0 commit comments