Skip to content
Merged
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
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"jsome": "~2.5.0",
"mri": "~1.2.0",
"nanospinner": "~1.2.2",
"picocolors": "~1.1.1",
"pretty-bytes": "5",
"pretty-ms": "~7.0.1",
"restore-cursor": "~3.1.0",
Expand Down
22 changes: 8 additions & 14 deletions src/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ const { URLSearchParams } = require('url')
const clipboardy = require('clipboardy')
const mql = require('@microlink/mql')
const prettyMs = require('pretty-ms')
const colors = require('picocolors')
const temp = require('temperment')
const fs = require('fs')
const os = require('os')

const { gray, green } = require('./colors')
const print = require('./print')
const exit = require('./exit')

Expand Down Expand Up @@ -113,36 +113,30 @@ const render = ({ response, flags }) => {
console.error()
console.error(
print.label('success', 'green'),
colors.gray(`${print.bytes(size)} in ${time}`)
gray(`${print.bytes(size)} in ${time}`)
)
console.error()

if (serverTiming) {
console.error(' ', print.keyValue(colors.green('timing'), serverTiming))
console.error(' ', print.keyValue(green('timing'), serverTiming))
}

if (cacheStatus) {
console.error(
' ',
print.keyValue(
colors.green('cache'),
`${cacheStatus} ${colors.gray(expiredAt)}`
)
print.keyValue(green('cache'), `${cacheStatus} ${gray(expiredAt)}`)
)
}

if (fetchMode) {
console.error(
' ',
print.keyValue(
colors.green('mode'),
`${fetchMode} ${colors.gray(fetchTime)}`
)
print.keyValue(green('mode'), `${fetchMode} ${gray(fetchTime)}`)
)
}

console.error(' ', print.keyValue(colors.green('uri'), uri))
console.error(' ', print.keyValue(colors.green('id'), id))
console.error(' ', print.keyValue(green('uri'), uri))
console.error(' ', print.keyValue(green('id'), id))

if (flags.copy) {
let copiedValue
Expand All @@ -152,7 +146,7 @@ const render = ({ response, flags }) => {
copiedValue = body
}
clipboardy.writeSync(JSON.stringify(copiedValue, null, 2))
console.error(`\n ${colors.gray('Copied to clipboard!')}`)
console.error(`\n ${gray('Copied to clipboard!')}`)
}
}

Expand Down
18 changes: 18 additions & 0 deletions src/colors.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
'use strict'

const { styleText } = require('node:util')

const gray = str => styleText('gray', str)

const white = str => styleText('white', str)

const green = str => styleText('green', str)

const red = str => styleText('red', str)

const yellow = str => styleText('yellow', str)

const label = (text, color) =>
styleText(['inverse', 'bold', color], ` ${text.toUpperCase()} `)

module.exports = { gray, white, green, red, yellow, label }
16 changes: 6 additions & 10 deletions src/exit.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const colors = require('picocolors')
const { gray, red } = require('./colors')

const print = require('./print')

Expand All @@ -15,31 +15,27 @@ module.exports = async (promise, { flags }) => {
console.log(
' ',
print.label((error.status || 'fail').toUpperCase(), 'red'),
colors.gray(error.message.replace(`${error.code}, `, ''))
gray(error.message.replace(`${error.code}, `, ''))
)
console.log()
if (error.data) {
console.log(print.keyValue(' ', JSON.stringify(error.data)))
console.log()
}
id && console.log(' ', print.keyValue(colors.red('id'), id))
error.url &&
console.log(' ', print.keyValue(colors.red('uri'), error.url))
id && console.log(' ', print.keyValue(red('id'), id))
error.url && console.log(' ', print.keyValue(red('uri'), error.url))
error.code &&
console.log(
' ',
print.keyValue(
colors.red('code'),
red('code'),
`${error.code} ${error.statusCode ? `(${error.statusCode})` : ''}`
)
)
error.more &&
console.log(
' ',
print.keyValue(
colors.red('more'),
print.link('click to report', error.more)
)
print.keyValue(red('more'), print.link('click to report', error.more))
)

process.exit(1)
Expand Down
2 changes: 1 addition & 1 deletion src/help.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const { gray, white } = require('picocolors')
const { gray, white } = require('./colors')

const code = str => `\`${str}\``

Expand Down
10 changes: 5 additions & 5 deletions src/print.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ const restoreCursor = require('restore-cursor')
const terminalLink = require('terminal-link')
const prettyBytes = require('pretty-bytes')
const prettyMs = require('pretty-ms')
const colors = require('picocolors')
const termImg = require('term-img')
const jsome = require('jsome')

const { gray, yellow, label } = require('./colors')

const TICK_INTERVAL = 50

jsome.colors = {
Expand Down Expand Up @@ -55,19 +56,18 @@ module.exports = {
json: (payload, { color: colorize = true } = {}) =>
colorize ? jsome(payload) : console.log(payload),

label: (text, color) =>
colors.inverse(colors.bold(colors[color](` ${text.toUpperCase()} `))),
label,

bytes: prettyBytes,

keyValue: (key, value) => key + ' ' + colors.gray(value),
keyValue: (key, value) => key + ' ' + gray(value),

image: filepath =>
console.log(
termImg(filepath, {
width: '50%',
fallback: () =>
`\n${colors.yellow(' tip:')} ${colors.gray(
`\n${yellow(' tip:')} ${gray(
'use iTerm >=3 to see the image here!'
)}`
})
Expand Down