fix(deps): replace chalk with tiny ansis

Oops and I got carried away and fixed a lot of types along the way.

Author: serhalp

eslint.config.js

@@ -79,6 +79,7 @@ export default tseslint.config(
     },
   },
   {
+    files: ['{src,tests}/**/*'],
     rules: {
       'no-restricted-imports': [
         'error',
@@ -96,9 +97,9 @@ export default tseslint.config(
             },
 
             {
-              name: 'chalk',
+              name: 'ansis',
               message:
-                'Use the safe chalk import that handles colors for json output: `import { chalk } from "src/utils/command-helpers.js"`',
+                'Use the configured ansis import that handles colors for json output: `import { ansis } from "src/utils/command-helpers.js"`',
             },
           ],
         },

package-lock.json

@@ -74,10 +74,10 @@
     "@pnpm/tabtab": "0.5.4",
     "ansi-escapes": "7.0.0",
     "ansi-to-html": "0.7.2",
+    "ansis": "^3.17.0",
     "ascii-table": "0.0.9",
     "backoff": "2.5.0",
     "boxen": "8.0.1",
-    "chalk": "5.4.1",
     "chokidar": "3.6.0",
     "ci-info": "4.1.0",
     "clean-deep": "3.4.0",

package.json

@@ -7,29 +7,10 @@ import fs from 'node:fs/promises'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import process from 'node:process'
-// eslint-disable-next-line no-restricted-imports
-import chalk from 'chalk'
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-const identity = (message) => message
+import ansis from 'ansis'
 
-/**
- *
- * @param {string} message
- * @param {Array<chalk['Color'] | chalk['Modifiers']>} styles
- * @returns
- */
-const format = (message, styles) => {
-  let func = identity
-  try {
-    func = chalk
-    styles.forEach((style) => {
-      func = func[style]
-    })
-  } catch {}
-  return func(message)
-}
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 const postInstall = async () => {
   const { createMainCommand } = await import('../dist/commands/index.js')
@@ -45,24 +26,17 @@ const postInstall = async () => {
   }
 
   console.log('')
-  console.log(await format('Success! Netlify CLI has been installed!', ['greenBright', 'bold', 'underline']))
+  console.log(ansis.greenBright.bold.underline('Success! Netlify CLI has been installed!'))
   console.log('')
   console.log('Your device is now configured to use Netlify CLI to deploy and manage your Netlify sites.')
   console.log('')
   console.log('Next steps:')
   console.log('')
-  console.log(
-    `  ${await format('netlify init', [
-      'cyanBright',
-      'bold',
-    ])}     Connect or create a Netlify site from current directory`,
-  )
-  console.log(
-    `  ${await format('netlify deploy', ['cyanBright', 'bold'])}   Deploy the latest changes to your Netlify site`,
-  )
+  console.log(`  ${ansis.cyanBright.bold('netlify init')}     Connect or create a Netlify site from current directory`)
+  console.log(`  ${ansis.cyan.bold('netlify deploy')}   Deploy the latest changes to your Netlify site`)
   console.log('')
-  console.log(`For more information on the CLI run ${await format('netlify help', ['cyanBright', 'bold'])}`)
-  console.log(`Or visit the docs at ${await format('https://cli.netlify.com', ['cyanBright', 'bold'])}`)
+  console.log(`For more information on the CLI run ${ansis.cyanBright.bold('netlify help')}`)
+  console.log(`Or visit the docs at ${ansis.cyanBright.bold('https://cli.netlify.com')}`)
   console.log('')
 }
 

scripts/postinstall.js

@@ -10,7 +10,6 @@ const main = async () => {
   //
   // Leaving development dependencies makes the CLI installation significantly larger and increases
   // the risk of platform-specific dependency installation issues.
-  // eslint-disable-next-line no-restricted-properties
   const packageJSONPath = path.join(process.cwd(), 'package.json')
   const rawPackageJSON = await fs.readFile(packageJSONPath, 'utf8')
 

scripts/prepublishOnly.js

@@ -1,11 +1,9 @@
 import { createMainCommand } from '../../../src/commands/index.js'
-import { sortOptions } from '../../../src/utils/command-helpers.js'
+import { compareOptions } from '../../../src/utils/command-helpers.js'
 
 const program = createMainCommand()
 
-/** @type {Array<import('../../../src/commands/base-command.js').default>} */
-// @ts-ignore typecast needed
-const commands = program.commands.sort((cmdA, cmdB) => cmdA.name().localeCompare(cmdB.name()))
+const commands = [...program.commands].sort((cmdA, cmdB) => cmdA.name().localeCompare(cmdB.name()))
 
 /**
  *
@@ -19,7 +17,7 @@ const parseCommand = function (command) {
 
   const flags = command.options
     .filter((option) => !option.hidden)
-    .sort(sortOptions)
+    .sort(compareOptions)
     .reduce((prev, cur) => {
       const name = cur.long.replace('--', '')
       const contentType = cur.argChoices ? cur.argChoices.join(' | ') : 'string'

site/scripts/util/generate-command-data.js

@@ -2,7 +2,7 @@ import AsciiTable from 'ascii-table'
 import type { OptionValues } from 'commander'
 import { methods, type NetlifyAPI } from 'netlify'
 
-import { chalk, logAndThrowError, exit, log, logJson } from '../../utils/command-helpers.js'
+import { ansis, logAndThrowError, exit, log, logJson } from '../../utils/command-helpers.js'
 import type BaseCommand from '../base-command.js'
 
 type ApiMethodName = keyof NetlifyAPI
@@ -23,7 +23,7 @@ export const apiCommand = async (apiMethodName: string, options: OptionValues, c
     log(table.toString())
     log()
     log('Above is a list of available API methods')
-    log(`To run a method use "${chalk.cyanBright('netlify api methodName')}"`)
+    log(`To run a method use "${ansis.cyanBright('netlify api methodName')}"`)
     exit()
   }
 

src/commands/api/api.ts

@@ -1,4 +1,4 @@
-import { chalk } from '../../utils/command-helpers.js'
+import { ansis } from '../../utils/command-helpers.js'
 import BaseCommand from '../base-command.js'
 
 export const createApiCommand = (program: BaseCommand) =>
@@ -7,7 +7,7 @@ export const createApiCommand = (program: BaseCommand) =>
     .argument('[apiMethod]', 'Open API method to run')
     .description(
       `Run any Netlify API method
-For more information on available methods checkout https://open-api.netlify.com/ or run '${chalk.grey(
+For more information on available methods checkout https://open-api.netlify.com/ or run '${ansis.gray(
         'netlify api --list',
       )}'`,
     )

src/commands/api/index.ts

@@ -19,7 +19,7 @@ import { getAgent } from '../lib/http-agent.js'
 import {
   NETLIFY_CYAN,
   USER_AGENT,
-  chalk,
+  ansis,
   logAndThrowError,
   exit,
   getToken,
@@ -28,7 +28,7 @@ import {
   normalizeConfig,
   padLeft,
   pollForToken,
-  sortOptions,
+  compareOptions,
   warn,
   logError,
 } from '../utils/command-helpers.js'
@@ -107,7 +107,7 @@ async function selectWorkspace(project: Project, filter?: string): Promise<strin
 
   if (!selected) {
     log()
-    log(chalk.cyan(`We've detected multiple sites inside your repository`))
+    log(ansis.cyan(`We've detected multiple sites inside your repository`))
 
     if (isCI) {
       throw new Error(
@@ -129,7 +129,7 @@ async function selectWorkspace(project: Project, filter?: string): Promise<strin
         (project.workspace?.packages || [])
           .filter((pkg) => pkg.path.includes(input))
           .map((pkg) => ({
-            name: `${pkg.name ? `${chalk.bold(pkg.name)}  ` : ''}${pkg.path}  ${chalk.dim(
+            name: `${pkg.name ? `${ansis.bold(pkg.name)}  ` : ''}${pkg.path}  ${ansis.dim(
               `--filter ${pkg.name || pkg.path}`,
             )}`,
             value: pkg.path,
@@ -286,7 +286,7 @@ export default class BaseCommand extends Command {
 
         if (description) {
           const pad = termWidth + HELP_SEPARATOR_WIDTH
-          const fullText = `${bang}${term.padEnd(pad - (isCommand ? 2 : 0))}${chalk.grey(description)}`
+          const fullText = `${bang}${term.padEnd(pad - (isCommand ? 2 : 0))}${ansis.gray(description)}`
           return helper.wrap(fullText, helpWidth - HELP_INDENT_WIDTH, pad)
         }
 
@@ -303,34 +303,34 @@ export default class BaseCommand extends Command {
 
       // on the parent help command the version should be displayed
       if (this.name() === 'netlify') {
-        output = [...output, chalk.bold('VERSION'), formatHelpList([formatItem(USER_AGENT)]), '']
+        output = [...output, ansis.bold('VERSION'), formatHelpList([formatItem(USER_AGENT)]), '']
       }
 
       // Usage
-      output = [...output, chalk.bold('USAGE'), helper.commandUsage(command), '']
+      output = [...output, ansis.bold('USAGE'), helper.commandUsage(command), '']
 
       // Arguments
       const argumentList = helper
         .visibleArguments(command)
         .map((argument) => formatItem(helper.argumentTerm(argument), helper.argumentDescription(argument)))
       if (argumentList.length !== 0) {
-        output = [...output, chalk.bold('ARGUMENTS'), formatHelpList(argumentList), '']
+        output = [...output, ansis.bold('ARGUMENTS'), formatHelpList(argumentList), '']
       }
 
       if (command.#noBaseOptions === false) {
         // Options
         const optionList = helper
           .visibleOptions(command)
-          .sort(sortOptions)
+          .sort(compareOptions)
           .map((option) => formatItem(helper.optionTerm(option), helper.optionDescription(option)))
         if (optionList.length !== 0) {
-          output = [...output, chalk.bold('OPTIONS'), formatHelpList(optionList), '']
+          output = [...output, ansis.bold('OPTIONS'), formatHelpList(optionList), '']
         }
       }
 
       // Description
       if (commandDescription.length !== 0) {
-        output = [...output, chalk.bold('DESCRIPTION'), formatHelpList(commandDescription), '']
+        output = [...output, ansis.bold('DESCRIPTION'), formatHelpList(commandDescription), '']
       }
 
       // Aliases
@@ -339,13 +339,13 @@ export default class BaseCommand extends Command {
       if (command._aliases.length !== 0) {
         // @ts-expect-error TS(2551) FIXME: Property '_aliases' does not exist on type 'Comman... Remove this comment to see the full error message
         const aliases = command._aliases.map((alias) => formatItem(`${parentCommand.name()} ${alias}`, null, true))
-        output = [...output, chalk.bold('ALIASES'), formatHelpList(aliases), '']
+        output = [...output, ansis.bold('ALIASES'), formatHelpList(aliases), '']
       }
 
       if (command.examples.length !== 0) {
         output = [
           ...output,
-          chalk.bold('EXAMPLES'),
+          ansis.bold('EXAMPLES'),
           formatHelpList(command.examples.map((example) => `${HELP_$} ${example}`)),
           '',
         ]
@@ -355,7 +355,7 @@ export default class BaseCommand extends Command {
         formatItem(cmd.name(), helper.subcommandDescription(cmd).split('\n')[0], true),
       )
       if (commandList.length !== 0) {
-        output = [...output, chalk.bold('COMMANDS'), formatHelpList(commandList), '']
+        output = [...output, ansis.bold('COMMANDS'), formatHelpList(commandList), '']
       }
 
       return [...output, ''].join('\n')
@@ -450,11 +450,11 @@ export default class BaseCommand extends Command {
 
     // Log success
     log()
-    log(chalk.greenBright('You are now logged into your Netlify account!'))
+    log(ansis.greenBright('You are now logged into your Netlify account!'))
     log()
-    log(`Run ${chalk.cyanBright('netlify status')} for account details`)
+    log(`Run ${ansis.cyanBright('netlify status')} for account details`)
     log()
-    log(`To see all available commands run: ${chalk.cyanBright('netlify help')}`)
+    log(`To see all available commands run: ${ansis.cyanBright('netlify help')}`)
     log()
     return accessToken
   }

src/commands/base-command.ts

@@ -1,6 +1,6 @@
 import { getStore } from '@netlify/blobs'
 
-import { chalk, logAndThrowError, log } from '../../utils/command-helpers.js'
+import { ansis, logAndThrowError, log } from '../../utils/command-helpers.js'
 import { promptBlobDelete } from '../../utils/prompts/blob-delete-prompts.js'
 
 /**
@@ -24,8 +24,8 @@ export const blobsDelete = async (storeName: string, key: string, _options: Reco
   try {
     await store.delete(key)
 
-    log(`${chalk.greenBright('Success')}: Blob ${chalk.yellow(key)} deleted from store ${chalk.yellow(storeName)}`)
+    log(`${ansis.greenBright('Success')}: Blob ${ansis.yellow(key)} deleted from store ${ansis.yellow(storeName)}`)
   } catch {
-    return logAndThrowError(`Could not delete blob ${chalk.yellow(key)} from store ${chalk.yellow(storeName)}`)
+    return logAndThrowError(`Could not delete blob ${ansis.yellow(key)} from store ${ansis.yellow(storeName)}`)
   }
 }

src/commands/blobs/blobs-delete.ts

@@ -4,7 +4,7 @@ import { resolve } from 'path'
 import { getStore } from '@netlify/blobs'
 import { OptionValues } from 'commander'
 
-import { chalk, logAndThrowError } from '../../utils/command-helpers.js'
+import { ansis, logAndThrowError } from '../../utils/command-helpers.js'
 import BaseCommand from '../base-command.js'
 
 interface Options extends OptionValues {
@@ -21,16 +21,16 @@ export const blobsGet = async (storeName: string, key: string, options: Options,
     token: api.accessToken ?? '',
   })
 
-  let blob
+  let blob: undefined | Awaited<ReturnType<typeof store.get>>
 
   try {
     blob = await store.get(key)
   } catch {
-    return logAndThrowError(`Could not retrieve blob ${chalk.yellow(key)} from store ${chalk.yellow(storeName)}`)
+    return logAndThrowError(`Could not retrieve blob ${ansis.yellow(key)} from store ${ansis.yellow(storeName)}`)
   }
 
   if (blob === null) {
-    return logAndThrowError(`Blob ${chalk.yellow(key)} does not exist in store ${chalk.yellow(storeName)}`)
+    return logAndThrowError(`Blob ${ansis.yellow(key)} does not exist in store ${ansis.yellow(storeName)}`)
   }
 
   if (output) {

src/commands/blobs/blobs-get.ts

@@ -2,7 +2,7 @@ import { getStore } from '@netlify/blobs'
 import AsciiTable from 'ascii-table'
 import { OptionValues } from 'commander'
 
-import { chalk, logAndThrowError, log, logJson } from '../../utils/command-helpers.js'
+import { ansis, logAndThrowError, log, logJson } from '../../utils/command-helpers.js'
 import BaseCommand from '../base-command.js'
 
 interface Options extends OptionValues {
@@ -32,7 +32,7 @@ export const blobsList = async (storeName: string, options: Options, command: Ba
     }
 
     if (blobs.length === 0 && directories.length === 0) {
-      log(`Netlify Blobs store ${chalk.yellow(storeName)} is empty`)
+      log(`Netlify Blobs store ${ansis.yellow(storeName)} is empty`)
       return
     }
 
@@ -50,6 +50,6 @@ export const blobsList = async (storeName: string, options: Options, command: Ba
 
     log(table.toString())
   } catch {
-    return logAndThrowError(`Could not list blobs from store ${chalk.yellow(storeName)}`)
+    return logAndThrowError(`Could not list blobs from store ${ansis.yellow(storeName)}`)
   }
 }