fix: terminal columns, moved limitText to utils

Author: gearonix

src/commands/ni.ts

@@ -85,7 +85,7 @@ runCli(async (agent, args, ctx) => {
       choices: [
         {
           title: 'prod',
-          value: null,
+          value: '',
           selected: true,
         },
         {

src/commands/nr.ts

@@ -1,12 +1,12 @@
 import process from 'node:process'
 import type { Choice } from '@posva/prompts'
 import prompts from '@posva/prompts'
-import c from 'kleur'
 import { Fzf } from 'fzf'
 import { dump, load } from '../storage'
 import { parseNr } from '../parse'
 import { getPackageJSON } from '../fs'
 import { runCli } from '../runner'
+import { limitText } from '../utils'
 
 runCli(async (agent, args, ctx) => {
   const storage = await load()
@@ -44,11 +44,6 @@ runCli(async (agent, args, ctx) => {
 
     const terminalColumns = process.stdout?.columns || 80
 
-    function limitText(text: string, maxWidth: number) {
-      if (text.length <= maxWidth)
-        return text
-      return `${text.slice(0, maxWidth)}${c.dim('…')}`
-    }
     const choices: Choice[] = raw
       .map(({ key, description }) => ({
         title: key,

src/commands/nun.ts

@@ -60,7 +60,7 @@ runCli(async (agent, args, ctx) => {
         name: 'depsToRemove',
         choices,
         instructions: false,
-        message: 'remove dependencies',
+        message: `remove ${isMultiple ? 'dependencies' : 'dependency'}`,
         async suggest(input: string, choices: Choice[]) {
           const results = fzf.find(input)
           return results.map(r => choices.find(c => c.value === r.item[0]))

src/fetch.ts

@@ -1,6 +1,7 @@
 import process from 'node:process'
 import type { Choice } from '@posva/prompts'
 import terminalLink from 'terminal-link'
+import { limitText } from './utils'
 
 export interface NpmPackage {
   name: string
@@ -23,14 +24,16 @@ export async function fetchNpmPackages(pattern: string): Promise<Choice[]> {
   const registryLink = (pattern: string) =>
         `https://registry.npmjs.com/-/v1/search?text=${pattern}&size=35`
 
+  const terminalColumns = process.stdout?.columns || 80
+
   try {
     const result = await fetch(registryLink(pattern))
       .then(res => res.json()) as NpmRegistryResponse
 
     return result.objects.map(({ package: pkg }) => ({
       title: terminalLink(pkg.name, pkg.links.repository ?? pkg.links.npm),
       value: pkg,
-      description: `${pkg.version} - ${pkg.description}`,
+      description: limitText(pkg.version, terminalColumns - 20),
     }))
   }
   catch (e) {

src/utils.ts

@@ -4,6 +4,7 @@ import { existsSync, promises as fs } from 'node:fs'
 import type { Buffer } from 'node:buffer'
 import process from 'node:process'
 import which from 'which'
+import c from 'kleur'
 
 export const CLI_TEMP_DIR = join(os.tmpdir(), 'antfu-ni')
 
@@ -107,3 +108,9 @@ export function invariant(condition: unknown, errorMsg?: string) {
    */
   process.exit(0)
 }
+
+export function limitText(text: string, maxWidth: number) {
+  if (text.length <= maxWidth)
+    return text
+  return `${text.slice(0, maxWidth)}${c.dim('…')}`
+}