wanzhuang-cli 1.0.1 → 1.0.3

package/README.md

@@ -40,21 +40,21 @@ wz create my-project -t uniapp
 
 ### 生成 API
 
-基于 Swagger/OpenAPI 规范自动生成 TypeScript API 代码：
+基于 Swagger/OpenAPI 规范自动生成 TypeScript API 代码（使用 @hey-api/openapi-ts）：
 
 ```bash
 # 默认生成到 src/api 目录
-wz api https://api.example.com/swagger.json
+wz api http://221.195.14.250:8011/swagger/v1/swagger.json
 
 # 指定输出目录
-wz api https://api.example.com/swagger.json -o ./src/services
+wz api http://221.195.14.250:8011/swagger/v1/swagger.json -o ./src/services
 ```
 
 生成的 API 包含：
 
 - TypeScript 类型定义
-- 请求函数
-- 参数验证
+- SDK 函数
+- JSON Schema 验证
 
 ### 更新依赖
 

package/dist/commands/create.d.ts

@@ -7,4 +7,5 @@
  */
 export declare function createProject(projectName: string, options: {
     force: boolean;
+    template?: string;
 }): Promise<void>;

package/dist/commands/create.js

@@ -15,6 +15,36 @@ const fs_extra_1 = require("fs-extra");
 const fileOps_1 = require("../utils/fileOps");
 const configGen_1 = require("../utils/configGen");
 const deps_1 = require("../utils/deps");
+/**
+ * 安全删除目录，带重试机制
+ */
+async function safeRemoveDir(dir, maxRetries = 3) {
+    for (let i = 0; i < maxRetries; i++) {
+        try {
+            await (0, fs_extra_1.remove)(dir);
+            return;
+        }
+        catch (err) {
+            if (err.code === 'EBUSY' || err.code === 'EPERM') {
+                if (i < maxRetries - 1) {
+                    console.log(chalk_1.default.yellow(`目录被占用，${1}秒后重试... (${i + 1}/${maxRetries})`));
+                    await new Promise(resolve => setTimeout(resolve, 1000));
+                }
+                else {
+                    throw new Error(`无法删除目录 ${dir}\n` +
+                        `请关闭以下可能占用该目录的程序后重试：\n` +
+                        `  - VSCode 或其他编辑器\n` +
+                        `  - 资源管理器\n` +
+                        `  - 终端（确保没有 cd 到该目录）\n` +
+                        `  - 正在运行的开发服务器`);
+                }
+            }
+            else {
+                throw err;
+            }
+        }
+    }
+}
 /**
  * 创建新项目的主函数
  * 1. 交互选择模板和功能
@@ -29,7 +59,7 @@ async function createProject(projectName, options) {
     if ((0, fs_1.existsSync)(targetDir)) {
         if (options.force) {
             console.log(chalk_1.default.yellow(`正在删除目录: ${targetDir}`));
-            (0, fs_extra_1.removeSync)(targetDir);
+            await safeRemoveDir(targetDir);
         }
         else {
             const { action } = await inquirer_1.default.prompt([
@@ -47,25 +77,31 @@ async function createProject(projectName, options) {
                 return;
             if (action === 'overwrite') {
                 console.log(chalk_1.default.yellow(`正在删除目录: ${targetDir}`));
-                (0, fs_extra_1.removeSync)(targetDir);
+                await safeRemoveDir(targetDir);
             }
         }
     }
     // 2. 创建新目录
     (0, fs_1.mkdirSync)(targetDir, { recursive: true });
-    // 3. 交互选择模板
-    const { template } = await inquirer_1.default.prompt([
-        {
-            name: 'template',
-            type: 'list',
-            message: '请选择项目模板:',
-            choices: [
-                { name: 'React', value: 'react' },
-                { name: 'Vue', value: 'vue' },
-                { name: 'UniApp', value: 'uniapp' },
-            ],
-        },
-    ]);
+    // 3. 获取模板（优先使用命令行参数）
+    let template = options.template;
+    // 如果没有指定模板或模板无效，则交互选择
+    const validTemplates = ['react', 'vue', 'uniapp'];
+    if (!template || !validTemplates.includes(template)) {
+        const answer = await inquirer_1.default.prompt([
+            {
+                name: 'template',
+                type: 'list',
+                message: '请选择项目模板:',
+                choices: [
+                    { name: 'React', value: 'react' },
+                    { name: 'Vue', value: 'vue' },
+                    { name: 'UniApp', value: 'uniapp' },
+                ],
+            },
+        ]);
+        template = answer.template;
+    }
     // 4. 交互多选功能
     const { features } = await inquirer_1.default.prompt([
         {

package/dist/utils/api.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateApi = generateApi;
-const openapi_ts_request_1 = require("openapi-ts-request");
+const openapi_ts_1 = require("@hey-api/openapi-ts");
 const fs_extra_1 = require("fs-extra");
-const prettier_1 = require("prettier");
 const path_1 = require("path");
 async function generateApi(schemaPath, outputDir) {
     try {
@@ -11,34 +10,18 @@ async function generateApi(schemaPath, outputDir) {
         const absoluteOutputDir = (0, path_1.resolve)(process.cwd(), outputDir);
         await (0, fs_extra_1.ensureDir)(absoluteOutputDir);
         // 生成 API 代码
-        await (0, openapi_ts_request_1.generateService)({
-            schemaPath,
-            serversPath: absoluteOutputDir,
-            requestLibPath: './request',
-            isGenReactQuery: false,
-            isDisplayTypeLabel: true,
-            isGenJsonSchemas: false,
-            isCamelCase: true,
-            enableLogging: true,
+        await (0, openapi_ts_1.createClient)({
+            input: schemaPath,
+            output: absoluteOutputDir,
+            plugins: [
+                '@hey-api/typescript',
+                '@hey-api/schemas',
+                {
+                    name: '@hey-api/sdk',
+                    asClass: false,
+                },
+            ],
         });
-        // 格式化生成的文件
-        const files = ['api.ts', 'types.ts', 'request.ts'];
-        for (const file of files) {
-            const filePath = (0, path_1.join)(absoluteOutputDir, file);
-            try {
-                const content = await (0, fs_extra_1.readFile)(filePath, 'utf-8');
-                const formattedContent = await (0, prettier_1.format)(content, {
-                    parser: 'typescript',
-                    singleQuote: true,
-                    trailingComma: 'all',
-                    printWidth: 100,
-                });
-                await (0, fs_extra_1.writeFile)(filePath, formattedContent);
-            }
-            catch (error) {
-                console.warn(`警告：无法格式化 ${file}:`, error);
-            }
-        }
         console.log('API 生成成功');
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wanzhuang-cli",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "万桩项目脚手架工具",
   "main": "dist/index.js",
   "bin": {
@@ -21,22 +21,22 @@
   "author": "万桩",
   "license": "MIT",
   "dependencies": {
+    "@hey-api/openapi-ts": "^0.92.3",
     "chalk": "^4.1.2",
     "commander": "^11.1.0",
     "fs-extra": "^11.3.0",
     "inquirer": "^8.2.6",
-    "openapi-ts-request": "^1.3.2",
     "ora": "^5.4.1"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/inquirer": "^9.0.7",
     "@types/node": "^20.17.32",
-    "@vitest/coverage-v8": "^1.0.0",
+    "@vitest/coverage-v8": "^4.0.18",
     "prettier": "^3.5.3",
     "rimraf": "^5.0.5",
     "typescript": "^5.8.3",
-    "vitest": "^1.0.0"
+    "vitest": "^4.0.18"
   },
   "engines": {
     "node": ">=14.0.0"

package/src/commands/create.ts

@@ -5,11 +5,41 @@ import inquirer from 'inquirer';
 import chalk from 'chalk';
 import ora from 'ora';
 import { copyTemplate, updatePackageJson } from '../utils/template';
-import { removeSync } from 'fs-extra';
+import { remove } from 'fs-extra';
 import { convertExtRecursive, replaceImportExtRecursive, addLangTsToAllVue, convertViteConfigToTs } from '../utils/fileOps';
 import { genTsConfig, genEslintConfig, genPrettierConfig, genUnoConfig, genTailwindConfig } from '../utils/configGen';
 import { getDevDeps, installDevDeps } from '../utils/deps';
 
+/**
+ * 安全删除目录，带重试机制
+ */
+async function safeRemoveDir(dir: string, maxRetries = 3): Promise<void> {
+  for (let i = 0; i < maxRetries; i++) {
+    try {
+      await remove(dir);
+      return;
+    } catch (err: any) {
+      if (err.code === 'EBUSY' || err.code === 'EPERM') {
+        if (i < maxRetries - 1) {
+          console.log(chalk.yellow(`目录被占用，${1}秒后重试... (${i + 1}/${maxRetries})`));
+          await new Promise(resolve => setTimeout(resolve, 1000));
+        } else {
+          throw new Error(
+            `无法删除目录 ${dir}\n` +
+            `请关闭以下可能占用该目录的程序后重试：\n` +
+            `  - VSCode 或其他编辑器\n` +
+            `  - 资源管理器\n` +
+            `  - 终端（确保没有 cd 到该目录）\n` +
+            `  - 正在运行的开发服务器`
+          );
+        }
+      } else {
+        throw err;
+      }
+    }
+  }
+}
+
 /**
  * 创建新项目的主函数
  * 1. 交互选择模板和功能
@@ -17,7 +47,7 @@ import { getDevDeps, installDevDeps } from '../utils/deps';
  * 3. 自动类型/配置/依赖集成
  * 4. 安装依赖并输出提示
  */
-export async function createProject(projectName: string, options: { force: boolean }) {
+export async function createProject(projectName: string, options: { force: boolean; template?: string }) {
   // 目标目录
   const targetDir = join(process.cwd(), projectName);
 
@@ -25,7 +55,7 @@ export async function createProject(projectName: string, options: { force: boole
   if (existsSync(targetDir)) {
     if (options.force) {
       console.log(chalk.yellow(`正在删除目录: ${targetDir}`));
-      removeSync(targetDir);
+      await safeRemoveDir(targetDir);
     } else {
       const { action } = await inquirer.prompt([
         {
@@ -41,7 +71,7 @@ export async function createProject(projectName: string, options: { force: boole
       if (!action) return;
       if (action === 'overwrite') {
         console.log(chalk.yellow(`正在删除目录: ${targetDir}`));
-        removeSync(targetDir);
+        await safeRemoveDir(targetDir);
       }
     }
   }
@@ -49,19 +79,26 @@ export async function createProject(projectName: string, options: { force: boole
   // 2. 创建新目录
   mkdirSync(targetDir, { recursive: true });
 
-  // 3. 交互选择模板
-  const { template } = await inquirer.prompt([
-    {
-      name: 'template',
-      type: 'list',
-      message: '请选择项目模板:',
-      choices: [
-        { name: 'React', value: 'react' },
-        { name: 'Vue', value: 'vue' },
-        { name: 'UniApp', value: 'uniapp' },
-      ],
-    },
-  ]);
+  // 3. 获取模板（优先使用命令行参数）
+  let template: 'react' | 'vue' | 'uniapp' = options.template as 'react' | 'vue' | 'uniapp';
+  
+  // 如果没有指定模板或模板无效，则交互选择
+  const validTemplates = ['react', 'vue', 'uniapp'];
+  if (!template || !validTemplates.includes(template)) {
+    const answer = await inquirer.prompt([
+      {
+        name: 'template',
+        type: 'list',
+        message: '请选择项目模板:',
+        choices: [
+          { name: 'React', value: 'react' },
+          { name: 'Vue', value: 'vue' },
+          { name: 'UniApp', value: 'uniapp' },
+        ],
+      },
+    ]);
+    template = answer.template;
+  }
 
   // 4. 交互多选功能
   const { features } = await inquirer.prompt([

package/src/utils/api.ts

@@ -1,7 +1,6 @@
-import { generateService } from 'openapi-ts-request';
-import { ensureDir, writeFile, readFile } from 'fs-extra';
-import { format } from 'prettier';
-import { join, resolve } from 'path';
+import { createClient } from '@hey-api/openapi-ts';
+import { ensureDir } from 'fs-extra';
+import { resolve } from 'path';
 
 export async function generateApi(schemaPath: string, outputDir: string): Promise<void> {
   try {
@@ -10,35 +9,19 @@ export async function generateApi(schemaPath: string, outputDir: string): Promis
     await ensureDir(absoluteOutputDir);
 
     // 生成 API 代码
-    await generateService({
-      schemaPath,
-      serversPath: absoluteOutputDir,
-      requestLibPath: './request',
-      isGenReactQuery: false,
-      isDisplayTypeLabel: true,
-      isGenJsonSchemas: false,
-      isCamelCase: true,
-      enableLogging: true,
+    await createClient({
+      input: schemaPath,
+      output: absoluteOutputDir,
+      plugins: [
+        '@hey-api/typescript',
+        '@hey-api/schemas',
+        {
+          name: '@hey-api/sdk',
+          asClass: false,
+        },
+      ],
     });
 
-    // 格式化生成的文件
-    const files = ['api.ts', 'types.ts', 'request.ts'];
-    for (const file of files) {
-      const filePath = join(absoluteOutputDir, file);
-      try {
-        const content = await readFile(filePath, 'utf-8');
-        const formattedContent = await format(content, {
-          parser: 'typescript',
-          singleQuote: true,
-          trailingComma: 'all',
-          printWidth: 100,
-        });
-        await writeFile(filePath, formattedContent);
-      } catch (error) {
-        console.warn(`警告：无法格式化 ${file}:`, error);
-      }
-    }
-
     console.log('API 生成成功');
   } catch (error) {
     console.error('生成 API 时出错:', error);