fix: 🧩 优化构建逻辑

packages/cli/index.ts

@@ -31,7 +31,11 @@ program
       const depth = +dep
       if (Number.isNaN(depth))
         throw new TypeError('illegal type of depth')
-      await genByCommand({ dep: depth, isBoth: both, jsonPath: json })
+      if (json) {
+        await genOutputFile(depth, 'json', json)
+        return
+      }
+      await genByCommand({ dep: depth, isBoth: both })
     }
     catch (err) {
       logDepthError()

packages/cli/src/genFile.ts

@@ -2,15 +2,15 @@ import { writeFile } from 'node:fs/promises'
 import path from 'node:path'
 import { genGraph, genPkgTree, genPkgs, genRelations, genTree, genVersions } from '@truth-cli/core'
 import type { IOptions } from '@truth-cli/shared'
-import { devDistPath, distPath, logFileWirteError, logFileWirteFinished } from '@truth-cli/shared'
+import { devDistPath, distPath, logFileWirteError, logFileWirteFinished, logLogo } from '@truth-cli/shared'
 
 const relations = genRelations()
 /**
  * 方便命令行操作的函数
  */
 export async function genWebFile(options: IOptions) {
   const begin = Date.now()
-  let { dep, isBoth, isDev, writePath } = options
+  let { dep, isBoth, isBuild: isDev, writePath } = options
   const graph = genGraph()
   const tree = genTree(dep)
   const versions = genVersions()
@@ -32,20 +32,24 @@ export async function genWebFile(options: IOptions) {
  */
 export async function genOutputFile(
   dep: number,
-  fileType: 'json' | 'txt',
+  fileType: 'json' | 'txt' | 'both',
   p?: string | boolean,
 ) {
+  logLogo()
   const begin = Date.now()
   if (!p || typeof p === 'boolean')
     p = './'
   try {
-    let pkgs = ''
-    if (fileType === 'json')
-      pkgs = JSON.stringify(genPkgs(dep))
-    else
-      pkgs = genPkgTree(dep)
-    const writeName = fileType === 'json' ? './pkgs.json' : './treePkgs.txt'
-    await writeFile(path.resolve(p, writeName), pkgs)
+    if (fileType === 'json') {
+      await writeFile(path.resolve(p, './pkgs.json'), JSON.stringify(genPkgs(dep)))
+    }
+    else if (fileType === 'txt') {
+      await writeFile(path.resolve(p, './treePkgs.txt'), genPkgTree(dep))
+    }
+    else {
+      await writeFile(path.resolve(p, './pkgs.json'), JSON.stringify(genPkgs(dep)))
+      await writeFile(path.resolve(p, './treePkgs.txt'), genPkgTree(dep))
+    }
     logFileWirteFinished(Date.now() - begin, p)
   }
   catch (err: any) {

packages/cli/src/index.ts

@@ -2,9 +2,9 @@ import { createServer } from 'node:http'
 import { readFileSync } from 'node:fs'
 import type { IOptions } from '@truth-cli/shared'
 import { devDistPath, distPath, logFileWirteError, logLogo, logWebStart } from '@truth-cli/shared'
-import { genOutputFile, genWebFile } from './genFile.js'
+import { genWebFile } from './genFile.js'
 
-const server = function (webPath: string) {
+const startServer = function (webPath: string) {
   return createServer((req, res) => {
     const html = readFileSync(`${webPath}/index.html`)
     const graph = readFileSync(`${webPath}/graph.json`)
@@ -26,28 +26,21 @@ const server = function (webPath: string) {
 /**
  * 启动服务器
  */
-function startWeb(begin: number, isDev?: boolean) {
-  isDev || logWebStart(Date.now() - begin)
-  const webStartPath = isDev ? devDistPath : distPath
-  server(webStartPath).listen(3002)
-}
 /**
  * 命令行操作函数
  */
 export async function genByCommand(options: IOptions) {
   logLogo()
-  const { dep, isBoth, isDev, isDeploy, jsonPath } = options
+  const { dep, isBoth, isBuild } = options
   const begin = Date.now()
   try {
     // 表示生成 pkgs.json 不打开网页
-    if (jsonPath) {
-      await genOutputFile(dep, 'json', jsonPath)
-      return
+    await genWebFile({ dep, isBoth, isBuild })
+    const webStartPath = isBuild ? devDistPath : distPath
+    if (!isBuild) {
+      logWebStart(Date.now() - begin)
+      startServer(webStartPath).listen(3002)
     }
-    await genWebFile({ dep, isBoth, isDev })
-    // 如果是 deploy 环境下，不启动网页
-    if (!isDeploy)
-      startWeb(begin, isDev)
   }
   catch (err: any) {
     logFileWirteError(err.message)

packages/shared/src/types.ts

@@ -74,9 +74,7 @@ export const categories = [
 export interface IOptions {
   dep: number
   isBoth?: boolean
-  isDev?: boolean
-  isDeploy?: boolean
-  jsonPath?: boolean
+  isBuild?: boolean
   writePath?: string
 }
 

scripts/build-deploy.ts

@@ -6,7 +6,7 @@ import { buildWeb } from './utils.js'
 const __dirname = fileURLToPath(new URL('.', import.meta.url))
 
 async function buildForDeploy() {
-  await genByCommand({ dep: 3, isDev: true, isBoth: false, isDeploy: true })
+  await genByCommand({ dep: 3, isBuild: true })
   await buildWeb({
     isDeploy: true,
     buildPath: path.resolve(__dirname, '../packages/web/dist'),

scripts/build-playground.ts

@@ -11,8 +11,7 @@ async function createPlaygroundServer() {
     dep: 3,
     writePath: playgroundAssetsPath,
   })
-  await genOutputFile(3, 'json', playgroundAssetsPath)
-  await genOutputFile(3, 'txt', playgroundAssetsPath)
+  await genOutputFile(3, 'both', playgroundAssetsPath)
   await buildWeb({
     isDeploy: true,
     buildPath: path.resolve(__dirname, '../playground/dist'),

scripts/dev.ts

@@ -6,7 +6,7 @@ import { createViteServer } from './utils.js'
 const __dirname = fileURLToPath(new URL('.', import.meta.url))
 
 async function createCliServer() {
-  await genByCommand({ dep: 3, isDev: true, isBoth: true })
+  await genByCommand({ dep: 3, isBuild: true, isBoth: true })
   const server = await createViteServer(path.resolve(__dirname, '../packages/web'))
   await server.listen()
   server.printUrls()

scripts/playground.ts

@@ -11,8 +11,7 @@ async function createPlaygroundServer() {
     dep: 3,
     writePath: playgroundAssetsPath,
   })
-  await genOutputFile(3, 'json', playgroundAssetsPath)
-  await genOutputFile(3, 'txt', playgroundAssetsPath)
+  await genOutputFile(3, 'both', playgroundAssetsPath)
   const server = await createViteServer(path.resolve(__dirname, '../playground/'), 1338)
   await server.listen()
   server.printUrls()