refactor: upgrade @poppinss/cliui

Author: sxzz

.prettierignore

@@ -44,6 +44,7 @@
   "devDependencies": {
     "@sxzz/eslint-config-prettier": "^2.4.6",
     "@sxzz/eslint-config-ts": "^2.4.6",
+    "@sxzz/prettier-config": "^1.0.4",
     "@types/node": "^20.8.10",
     "bumpp": "^9.2.0",
     "date-fns": "^2.30.0",
@@ -57,5 +58,6 @@
   },
   "engines": {
     "node": ">=16.14.0"
-  }
+  },
+  "prettier": "@sxzz/prettier-config"
 }

.prettierrc

@@ -1,6 +1,6 @@
-import { logger } from '@poppinss/cliui'
 import { createCommand } from 'commander'
 import { limit } from 'jike-sdk/polyfill'
+import { ui } from '../ui'
 import { createClient, displayUser, filterUsers } from '../utils/user'
 import { displayImage, renderDivider } from '../utils/terminal'
 import type { Entity } from 'jike-sdk/polyfill'
@@ -26,7 +26,7 @@ export const likeRank = createCommand('like-rank')
 export const likeRanking = async ({ top, count }: LikeRankOptions) => {
   const [user] = filterUsers()
 
-  const spinner = logger.await('Fetching posts')
+  const spinner = ui.logger.await('Fetching posts')
 
   const client = createClient(user)
   const posts = await client.getSelf().queryPersonalUpdate({
@@ -59,8 +59,8 @@ export const likeRanking = async ({ top, count }: LikeRankOptions) => {
       .map(async ({ user, count }) => {
         const ranking = getRanking(count)
         let text = `${renderRanking(ranking)} ${displayUser(
-          user
-        )} 点赞 ${logger.colors.cyan(`${count}`)} 次，${(
+          user,
+        )} 点赞 ${ui.colors.cyan(`${count}`)} 次，${(
           (count / posts.length) *
           100
         ).toFixed(2)}%`
@@ -71,7 +71,7 @@ export const likeRanking = async ({ top, count }: LikeRankOptions) => {
           }\n${text}\n${divider}`
         }
         return text
-      })
+      }),
   )
 
   spinner.stop()

package.json

@@ -1,10 +1,9 @@
-import { logger } from '@poppinss/cliui'
 import { createCommand } from 'commander'
 import { limit } from 'jike-sdk/polyfill'
 import { format } from 'date-fns'
+import { ui } from '../ui'
 import { displayImage, printIfRaw, renderDivider } from '../utils/terminal'
 import { createClient, displayUsers, filterUsers } from '../utils/user'
-import type { Spinner } from '@poppinss/cliui/build/src/Logger/Spinner'
 import type { Entity } from 'jike-sdk/polyfill'
 
 interface NotificationOptions {
@@ -29,7 +28,7 @@ const showNotifications = async (opts: NotificationOptions) => {
   const client = createClient(user)
 
   const count = +(opts.count ?? 30)
-  const spinner = logger.await('Loading notifications...')
+  const spinner = ui.logger.await('Loading notifications...')
   const notifications = await client
     .queryNotifications({
       limit: limit.limitMaxCount(count),
@@ -40,19 +39,20 @@ const showNotifications = async (opts: NotificationOptions) => {
             100
           ).toFixed(2)}%)`
         )
+        return true
       },
     })
     .finally(() => spinner.stop())
 
-  logger.success('Loading notifications done!')
+  ui.logger.success('Loading notifications done!')
 
   printIfRaw(notifications)
 
   {
     const divider = renderDivider()
 
-    let spinner: Spinner | undefined
-    if (opts.image) spinner = logger.await('Downloading images')
+    let spinner: ReturnType<typeof ui.logger.await> | undefined
+    if (opts.image) spinner = ui.logger.await('Downloading images')
 
     const texts = (
       await Promise.all(
@@ -75,7 +75,7 @@ async function renderNotification(
 ): Promise<string[]> {
   const users = n.actionItem?.users ?? []
   let usersText = displayUsers(users)
-  const bio = logger.colors.gray(users[0].bio ?? '')
+  const bio = ui.colors.gray(users[0].bio ?? '')
 
   const usersCount = n.actionItem?.usersCount
   if (typeof usersCount === 'number' && users.length !== usersCount) {
@@ -106,7 +106,7 @@ async function renderNotification(
 
   if (texts) {
     const timeStr = format(new Date(n.createdAt), 'yyyy-MM-dd HH:mm:ss')
-    texts.unshift(logger.colors.gray(timeStr))
+    texts.unshift(ui.colors.gray(timeStr))
     return texts.filter((text) => text.trim() !== EMPTY_PLACEHOLDER)
   } else {
     warnUnknownType(n)
@@ -178,7 +178,7 @@ async function renderNotification(
 
 const warnUnknownType = (n: Entity.Notification) => {
   const info = [n.type, n.actionType, n.actionItem.type].join('||')
-  logger.warning(
+  ui.logger.warning(
     `Unknown notification: ${info}. Please send it to developer, thanks!`
   )
 }

pnpm-lock.yaml

@@ -4,8 +4,8 @@ import { spawnSync } from 'node:child_process'
 import { createCommand } from 'commander'
 import { ApiOptions } from 'jike-sdk/polyfill'
 import { format } from 'date-fns'
-import { logger, sticker } from '@poppinss/cliui'
 import enquirer from 'enquirer'
+import { ui } from '../../ui'
 import { configDir } from '../../utils/config'
 import { createClient, displayConfigUser, filterUsers } from '../../utils/user'
 import { errorAndExit } from '../../utils/log'
@@ -41,7 +41,7 @@ export const createPost = async ({ content, topic }: CreateOptions) => {
     spawnSync('vim', [draftFile], { stdio: 'inherit' })
 
     content = await readFile(draftFile, 'utf-8').catch((err) => {
-      logger.warning(err)
+      ui.logger.warning(err)
       return ''
     })
   }
@@ -51,7 +51,7 @@ export const createPost = async ({ content, topic }: CreateOptions) => {
     errorAndExit(new Error('Content is required.'))
   }
 
-  const s = sticker().heading('✍️ Content')
+  const s = ui.sticker().heading('✍️ Content')
   content.split('\n').forEach((line) => s.add(line))
   s.render()
 
@@ -64,7 +64,7 @@ export const createPost = async ({ content, topic }: CreateOptions) => {
     initial: true,
   })
   if (!isConfirm) {
-    logger.error('User canceled.')
+    ui.logger.error('User canceled.')
     return
   }
 
@@ -74,9 +74,9 @@ export const createPost = async ({ content, topic }: CreateOptions) => {
       .createPost(ApiOptions.PostType.ORIGINAL, content, {
         topicId: topic,
       })
-      .catch((err) => logger.fatal(err))
-    logger.success(
-      `${logger.colors.bold(displayConfigUser(user))} posted successfully!`
+      .catch((err) => ui.logger.fatal(err))
+    ui.logger.success(
+      `${ui.colors.bold(displayConfigUser(user))} posted successfully!`
     )
   }
 }

src/command/like-rank.ts

@@ -1,6 +1,6 @@
 import { createCommand } from 'commander'
 import { ApiOptions, limit } from 'jike-sdk/polyfill'
-import { logger } from '@poppinss/cliui'
+import { ui } from '../../ui'
 import {
   createClient,
   displayUser,
@@ -70,8 +70,8 @@ async function renderPost(
   } else if (p.type === ApiOptions.PostType.ORIGINAL) {
     const detail = p.detail as Entity.OriginalPost
     const link = isMacOS
-      ? logger.colors.gray(
-          logger.colors.underline(`jike://page.jk/originalPost/${p.id}`)
+      ? ui.colors.gray(
+          ui.colors.underline(`jike://page.jk/originalPost/${p.id}`)
         )
       : ''
     texts.push(
@@ -92,8 +92,8 @@ async function renderPost(
     if (detail.linkInfo) {
       texts.push(
         (await displayImage(detail.linkInfo.pictureUrl)).result,
-        `分享链接 [${detail.linkInfo.title}](${logger.colors.blue(
-          logger.colors.underline(detail.linkInfo.linkUrl)
+        `分享链接 [${detail.linkInfo.title}](${ui.colors.blue(
+          ui.colors.underline(detail.linkInfo.linkUrl)
         )})`
       )
     }

src/command/msg.ts

@@ -1,6 +1,6 @@
 import { createCommand } from 'commander'
 import { limit } from 'jike-sdk/polyfill'
-import { logger } from '@poppinss/cliui'
+import { ui } from '../../ui'
 import { createClient, displayUser, filterUsers } from '../../utils/user'
 import { displayImage, printIfRaw, renderDivider } from '../../utils/terminal'
 import { isMacOS } from '../../utils/os'
@@ -47,8 +47,8 @@ async function renderPost(p: JikePostWithDetail) {
   const texts: string[] = []
   if (detail.type === 'ORIGINAL_POST') {
     const link = isMacOS
-      ? logger.colors.gray(
-          logger.colors.underline(`jike://page.jk/originalPost/${p.id}`)
+      ? ui.colors.gray(
+          ui.colors.underline(`jike://page.jk/originalPost/${p.id}`)
         )
       : ''
     texts.push(
@@ -69,8 +69,8 @@ async function renderPost(p: JikePostWithDetail) {
     if (detail.linkInfo) {
       texts.push(
         (await displayImage(detail.linkInfo.pictureUrl)).result,
-        `分享链接 [${detail.linkInfo.title}](${logger.colors.blue(
-          logger.colors.underline(detail.linkInfo.linkUrl)
+        `分享链接 [${detail.linkInfo.title}](${ui.colors.blue(
+          ui.colors.underline(detail.linkInfo.linkUrl)
         )})`
       )
     }

src/command/post/create.ts

@@ -1,5 +1,5 @@
-import { logger } from '@poppinss/cliui'
 import { createCommand } from 'commander'
+import { ui } from '../../ui'
 import { filterUsers } from '../../utils/user'
 
 export const alias = createCommand('alias')
@@ -10,10 +10,10 @@ export const alias = createCommand('alias')
 export const setAlias = ({ alias }: { alias: string }) => {
   const users = filterUsers()
   if (users.length > 1) {
-    logger.error("You can't set alias for multiple users")
+    ui.logger.error("You can't set alias for multiple users")
     process.exit(1)
   }
 
   users[0].alias = alias
-  logger.success(`Alias set to ${alias}`)
+  ui.logger.success(`Alias set to ${alias}`)
 }