@microlink/cli 2.1.48 → 2.1.51

package/package.json

@@ -2,7 +2,7 @@
   "name": "@microlink/cli",
   "description": "Interacting with Microlink API from your terminal.",
   "homepage": "https://github.com/microlinkhq/cli",
-  "version": "2.1.48",
+  "version": "2.1.51",
   "main": "src/index.js",
   "bin": {
     "microlink": "bin/microlink",
@@ -34,13 +34,12 @@
   ],
   "dependencies": {
     "@kikobeats/content-type": "~1.0.1",
-    "@microlink/mql": "~0.14.0",
+    "@microlink/mql": "~0.15.1",
     "clipboardy": "~2.3.0",
     "is-local-address": "~2.3.0",
     "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",
@@ -72,6 +71,17 @@
     "bin",
     "src"
   ],
+  "scripts": {
+    "clean": "rm -rf node_modules",
+    "contributors": "(npx git-authors-cli && npx finepack && git add package.json && git commit -m 'build: contributors' --no-verify) || true",
+    "lint": "standard-markdown README.md && standard",
+    "postrelease": "npm run release:tags && npm run release:github && (ci-publish || npm publish --access=public)",
+    "pretest": "npm run lint",
+    "release": "standard-version -a",
+    "release:github": "github-generate-release",
+    "release:tags": "git push --follow-tags origin HEAD:master",
+    "test": "c8 ava"
+  },
   "preferGlobal": true,
   "license": "MIT",
   "commitlint": {
@@ -99,16 +109,5 @@
   "simple-git-hooks": {
     "commit-msg": "npx commitlint --edit",
     "pre-commit": "npx nano-staged"
-  },
-  "scripts": {
-    "clean": "rm -rf node_modules",
-    "contributors": "(npx git-authors-cli && npx finepack && git add package.json && git commit -m 'build: contributors' --no-verify) || true",
-    "lint": "standard-markdown README.md && standard",
-    "postrelease": "npm run release:tags && npm run release:github && (ci-publish || npm publish --access=public)",
-    "pretest": "npm run lint",
-    "release": "standard-version -a",
-    "release:github": "github-generate-release",
-    "release:tags": "git push --follow-tags origin HEAD:master",
-    "test": "c8 ava"
   }
-}
+}

package/src/api.js

@@ -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')
 
@@ -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
@@ -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!')}`)
   }
 }
 

package/src/colors.js

@@ -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 }

package/src/exit.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const colors = require('picocolors')
+const { gray, red } = require('./colors')
 
 const print = require('./print')
 
@@ -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)

package/src/help.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { gray, white } = require('picocolors')
+const { gray, white } = require('./colors')
 
 const code = str => `\`${str}\``
 

package/src/print.js

@@ -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 = {
@@ -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!'
           )}`
       })

package/bin/microlink-beta

@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-
-const cli = require('../src/cli')
-cli.flags.endpoint = 'https://beta.microlink.io'
-delete cli.flags.apiKey
-
-require('../src/api')(cli, {
-  headers: {
-    authorization: require('../../api/src/constant').MICROLINK_API_AUTHORIZATION
-  }
-})

package/bin/microlink-dev

@@ -1,12 +0,0 @@
-#!/usr/bin/env node
-
-const cli = require('../src/cli')
-cli.flags.endpoint = 'http://localhost:3000'
-delete cli.flags.apiKey
-
-require('../src/api')(cli, {
-  retry: 0,
-  headers: {
-    authorization: require('../../api/src/constant').AUTHORIZATION
-  }
-})

package/bin/microlink-next

@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-
-const cli = require('../src/cli')
-cli.flags.endpoint = 'https://next.microlink.io'
-delete cli.flags.apiKey
-
-require('../src/api')(cli, {
-  headers: {
-    authorization: require('../../api/src/constant').AUTHORIZATION_TOKEN
-  }
-})

package/bin/microlink-vercel

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-const cli = require('../src/cli')
-cli.flags.endpoint = 'https://vercel.microlink.io'
-require('../src/api')(cli)