lzx-test-cli 1.0.1 → 1.0.3

package/bin/index.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 
+import path from 'path';
+import { fileURLToPath } from 'url';
 import { Command } from 'commander';
 import fs from 'fs-extra';
 import inquirer from 'inquirer';
 import chalk from 'chalk';
-// import ora from 'ora';
+import ora from 'ora';
 import compressing from 'compressing'; //支持- tar - gzip - tgz - zip
-import path from 'path';
 import { spawn } from 'child_process';
 import fetch from 'node-fetch';
-import cliProgress from 'cli-progress';
 // import download from 'download-git-repo';
 console.log(
     chalk.green('开始创建项目!')
@@ -57,7 +57,7 @@ function runCommand(cwd) {
           cwd: safeCwd,
           stdio: 'inherit'
         });
-    console.log(chalk.green("\n依赖安装中..."));
+    console.log(chalk.green("\n开始安装依赖,请耐心等待..."));
     child.on('error', reject);
     child.on('close', code => {
       if (code !== 0) {
@@ -70,41 +70,43 @@ function runCommand(cwd) {
   });
 }
 
+function showPercent(downloaded, total) {
+  const percent = total > 0
+    ? Math.floor((downloaded / total) * 100)
+    : 0;
+
+  // \r 回到当前行起始位置，不换行
+  process.stdout.write(`\r下载进度： ${percent}%`);
+}
+
+
 /**
   * @param {string} url 下载链接
   * @param {string} targetDir 目标文件夹
   * @param {string} fileName 保存的文件名
   * @description: 下载文件并显示进度条
  */
-export async function downloadFileToFolder(url, targetDir, fileName) {
+export async function downloadFileToFolder(url, targetDir, fileName, headers = {}) {
   // 目标文件夹确保存在
   await fs.promises.mkdir(targetDir, { recursive: true });
 
   const dest = path.join(targetDir, fileName);
 
   const res = await fetch(url, {
-    headers: {
-      'User-Agent': 'node.js',  
-      'Accept': 'application/octet-stream'
-      // 'Authorization': `token ${YOUR_TOKEN}`
-    },
+    headers,
     redirect: 'follow', // 跟随重定向
   });
   if (!res.ok) throw new Error(`下载失败: ${res.status} ${res.statusText}`);
 
   // 获取 content-length 用于进度条（如果服务器提供）
   const total = +res.headers.get('content-length') || 0;
-  const progressBar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
-  if (total > 0) progressBar.start(total, 0);
-
   const fileStream = fs.createWriteStream(dest);
-
-
   let downloaded = 0;
+
   // 监听 data 更新进度
   res.body.on('data', chunk => {
     downloaded += chunk.length;
-    if (total > 0) progressBar.update(downloaded);
+    if (total > 0) showPercent(downloaded, total);
   });
 
   await new Promise((resolve, reject) => {
@@ -218,20 +220,19 @@ program
                     message: '是否强制覆盖',
                 },
             ]);
-            // const syncTemplate = ora('同步模版中...')
-            // syncTemplate.start()
+            const syncTemplate = ora({
+                text: chalk.yellow('项目创建中...'),
+            })
+            syncTemplate.start()
             const cwd = process.cwd();
-            const targetDir = `${cwd}/${projectName}`;
+            const targetDir = path.resolve(cwd, projectName);
             if (fs.existsSync(targetDir)) { 
                 if (force) {
                     fs.removeSync(targetDir); //删除项目下已有的
                 }
             }
             fs.mkdirsSync(targetDir);
-            console.log("🚀 ~ :231 ~ targetDir:", targetDir)
-            
-            const templatePath = path.resolve("", templateChosen)            
-            console.log("🚀 ~ :233 ~ templatePath:", templatePath)
+
             if(downloadType === 'remote') {
               const repoMap = {
                 'template-main': main_proj_remote_url,
@@ -242,19 +243,21 @@ program
                 const headers = {
                   'User-Agent': 'node.js',
                   'Accept': 'application/octet-stream',
+                  // 'Authorization': `token ${YOUR_TOKEN}`
                 }
                 const fileName  = getFileNameFromUrl(repoUrl);
                 await downloadFileToFolder(repoUrl, targetDir, fileName, headers);
               }
             } else{
-              await fs.copySync(templatePath, targetDir)
+              // const templatePath = path.resolve("templates", templateChosen);  //不能这样使用，这是当前cli工具执行时的工作目录              
+              const __filename = fileURLToPath(import.meta.url); //由于使用esm, 需要使用__dirname读取模块相关的文件（不受执行位置影响）
+              const __dirname = path.dirname(__filename);
+              const templatesDir = path.join(__dirname, '../', templateChosen);
+              await fs.copySync(templatesDir, targetDir)
             }
             console.log(chalk.green("\n同步模版成功,开始解压并安装依赖..."));
             await unCompressFileAndInstall(targetDir);
-            // syncTemplate.succeed('同步模版成功')  
-            console.log(
-              chalk.green(chalk.blue.underline.bold(projectName) + ' 项目创建成功!')
-            );
+            syncTemplate.succeed(chalk.green(chalk.blue.underline.bold(projectName) + ' 项目创建成功!'))  
             // 退出
             process.stdin.pause();
             process.exit(0); // 完成后正常退出
@@ -262,6 +265,8 @@ program
             if (e && e.name === 'ExitPromptError') {
               console.log('\n 已取消创建!');
               process.exit(0);
+            }else{
+              console.log('\n 项目创建失败: ' + e.message);
             }
             process.exit(1); // 遇错退出
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lzx-test-cli",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "bin": {
     "lzx-test-cli": "bin/index.js"
   },
@@ -22,7 +22,6 @@
   "dependencies": {
     "@types/fs-extra": "^11.0.4",
     "chalk": "^5.6.2",
-    "cli-progress": "^3.12.0",
     "commander": "^14.0.2",
     "compressing": "^2.0.0",
     "download-git-repo": "^3.0.2",