wyt-cli 1.0.2 → 1.0.3

package/bin/commands/create.js

@@ -1,96 +1,270 @@
 // commands/create.js
 
-import path from "path";
-import { require, projectRoot } from "../lib/utils.js";
+import path from 'path';
+// import { require } from '../lib/utils.js';
+import { log_error, log_info, log_success, log_warning } from '../lib/logger.js';
 
 // 外部依赖
-import { Command } from "commander";
-import fs from "fs-extra";
-import ora from "ora";
-import chalk from "chalk";
-import inquirer from "inquirer";
+import { Command } from 'commander';
+import { glob } from 'glob';
+import fs from 'fs-extra';
+import ora from 'ora';
+import inquirer from 'inquirer';
+import ejs from 'ejs';
 
+const spinner = ora();
 // 命令配置
 export default function () {
-  const command = new Command("create");
-  command.description("创建一个新项目");
-  command.argument("[project-name]", "项目名称（仅支持字母、数字和中划线）", "my-project");
-  command.option("-t, --template <template-name>", "指定项目模板", "default");
-  command.option("-d, --dir <directory>", "指定创建目录", process.cwd());
-  command.option("-f, --force", "强制覆盖已存在目录");
-  command.action(core);
+  const command = new Command('create');
+  command.description('创建一个新项目');
+  command.argument('[project-name]', '项目名称（仅支持字母、数字和中划线）', '');
+  command.option('-t, --template <template-name>', '指定项目模板', 'default');
+  command.option('-d, --dir <directory>', '指定创建目录', process.cwd());
+  command.option('-l, --list', '显示已有项目列表', true);
+  command.option('-f, --force', '强制覆盖已存在目录');
+  command.action(async (projectName, options) => {
+    // 校验项目根目录是否合法
+    if (!checkTargetDir(options.dir)) {
+      log_error('请在 HRP3.0 项目根目录下创建项目！');
+      return;
+    }
+    spinner.start('正在获取已有项目列表...');
+    const glob_projectInfo = await checkProjectInfo(options);
+    spinner.stop();
+
+    // 询问 -> 创建项目
+    const inquirerAnswers = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'projectName',
+        message: '请输入项目名称:',
+        validate: (input) => {
+          // 校验规则
+          if (!input) return '项目名称不能为空！';
+          if (!/^[a-zA-Z0-9-]{1,50}$/.test(input)) {
+            return '名称只能包含字母、数字和中划线，且不超过50字符';
+          }
+          if (glob_projectInfo.map((item) => item.name).includes(input.toLowerCase())) {
+            return `项目名称 "${input}" 已存在，请重新输入`;
+          }
+          return true;
+        },
+        // 当命令行已传入名称时自动跳过
+        when: !projectName,
+      },
+      {
+        type: 'input',
+        name: 'devServerPort',
+        message: '请输入测试服务器端口号:',
+        validate: (input) => {
+          // 校验规则
+          if (!input) return '测试服务器端口号不能为空！';
+          if (!/^\d+$/.test(input)) {
+            return '测试服务器端口号必须为纯数字';
+          }
+          if (glob_projectInfo.map((item) => item.port).includes(input)) {
+            return `测试服务器端口号 "${input}" 已存在，请重新输入`;
+          }
+          return true;
+        },
+      },
+    ]);
+
+    // 执行创建项目逻辑
+    projectName = inquirerAnswers.projectName || projectName;
+    options.devServerPort = inquirerAnswers.devServerPort;
+    createAction(projectName, options);
+  });
 
   return command;
 }
 
 // 核心创建逻辑
-function core(projectName, options) {
+function createAction(projectName, options) {
   try {
-    // 校验项目名称是否合法
-    if (!/^[a-zA-Z0-9-]+$/.test(projectName)) {
-      console.error("项目名称只能包含字母、数字和中划线！");
-      return;
-    }
-    const spinner = ora("正在创建项目...").start();
-    const targetDir = path.resolve(options.dir, projectName);
+    const targetDir = path.resolve(options.dir, 'apps', projectName);
     // 校验目录存在性
     if (fs.existsSync(targetDir)) {
       if (!options.force) {
-        spinner.fail(`目录 ${targetDir} 已存在`);
-        throw new Error("使用 --force 强制覆盖");
+        throw new Error(`项目 ${projectName} 已存在，使用 --force 强制覆盖`);
       }
-      spinner.stop();
       inquirer
         .prompt([
           {
-            type: "confirm",
-            name: "confirmOverwrite",
-            message: `目录 ${targetDir} 已存在，是否覆盖？`,
+            type: 'confirm',
+            name: 'confirmOverwrite',
+            message: `项目 ${projectName} 已存在，是否覆盖？`,
             default: true,
           },
         ])
         .then((answers) => {
           if (answers.confirmOverwrite) {
-            spinner.info("强制覆盖已存在目录");
             fs.emptyDirSync(targetDir);
-            createProject(projectName, targetDir, options);
-
-            // 关闭进度条
-            spinner.succeed(chalk.green(`项目 ${projectName} 强制创建成功！`));
+            createProject(projectName, options);
+            log_success(`项目 ${projectName} 强制创建成功！`);
           } else {
-            spinner.fail("操作已取消");
+            log_info('操作已取消');
             process.exit(1);
           }
         });
     } else {
-      createProject(projectName, targetDir, options);
-
-      // 关闭进度条
-      spinner.succeed(chalk.green(`项目 ${projectName} 创建成功！`));
+      createProject(projectName, options);
+      log_success(`项目 ${projectName} 创建成功！`);
     }
   } catch (error) {
-    console.error(chalk.red(`\n错误：${error.message}`));
+    log_error(error.message);
     process.exit(1);
   }
 }
 
+// 检查目标目录是否存在
+function checkTargetDir(currentPath) {
+  const monoDirs = ['apps', 'packages'];
+  const conflictDirs = monoDirs
+    .map((dir) => ({
+      name: dir,
+      path: path.join(currentPath, dir),
+      exists: fs.existsSync(path.join(currentPath, dir)),
+    }))
+    .filter((item) => item.exists)
+    .map((item) => item.name);
+
+  return conflictDirs.join(',') == monoDirs.join(',');
+}
+
 // 创建项目
-function createProject(projectName, targetDir, options) {
-  // 复制模板文件
-  const templatePath = path.resolve(projectRoot, "bin", "templates", options.template);
-  fs.ensureDirSync(targetDir); // 创建项目目录
-  fs.copySync(templatePath, targetDir, {
-    filter: (src) => {
-      // 定义要排除的文件/目录名
-      const excludes = new Set(["node_modules", "package-lock.json"]);
-      // 获取当前处理的文件/目录名
-      const basename = path.basename(src);
-      // 过滤逻辑：存在排除列表中的不复制
-      return !excludes.has(basename);
-    },
+async function createProject(projectName, options) {
+  const files = await glob('./wyt-cli/bin/templates/**/*', {
+    cwd: process.cwd(), // 以项目根目录为基准
+    absolute: true, // 返回绝对路径
+    nodir: true, // 只保留文件
+  });
+  const renderTasks = files.map(async (filePath) => {
+    // 生成输出路径
+    const outputPath = filePath.replace('wyt-cli\\bin\\templates\\default', `apps\\${projectName}`);
+
+    // 递归创建所有不存在的父级目录，确保输出目录存在
+    fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+
+    // 自动读取文件内容, 渲染模板文件
+    const fileContent = await ejs.renderFile(filePath, {
+      projectName,
+      buildOutDir: `../../dist/${projectName}`,
+      devServerPort: Number(options.devServerPort),
+    });
+
+    // 写入文件
+    fs.writeFileSync(outputPath, fileContent);
+
+    return outputPath;
+  });
+
+  // 执行所有渲染任务
+  Promise.all(renderTasks);
+
+  // 更新 root -> package.json -> apps 配置
+  updateRootPackageJson(projectName, options);
+}
+
+// 检测已有项目信息
+async function checkProjectInfo(options) {
+  const files = await glob(['**/package.json'], {
+    cwd: path.resolve(options.dir, 'apps'), // 以项目根目录为基准
+    absolute: true, // 返回绝对路径
+    ignore: [
+      // 添加排除规则
+      '**/node_modules/**', // 排除 node_modules
+      '**/src/**', // 排除测试目录
+      '**/.*', // 排除隐藏文件/目录
+    ],
+  });
+
+  let results = await Promise.all(
+    files.map(async (file) => {
+      // 识别文件类型
+      const isPkg = file.endsWith('package.json');
+      // const isVite = file.endsWith('vite.config.js');
+      // const isVite_ts = file.endsWith('vite.config.ts');
+
+      try {
+        // 读取文件内容
+        const content = await fs.promises.readFile(file, 'utf-8');
+
+        if (isPkg) {
+          // 解析 package.json
+          const pkg = JSON.parse(content);
+          return { port: pkg.devServer && pkg.devServer.port, name: pkg.name };
+        }
+
+        // if (isVite) {
+        //   // 动态导入 vite 配置
+        //   const viteConfig = require(file);
+        //   const port = viteConfig.default?.server.port;
+        //   return { type: 'vite', port };
+        // }
+
+        // // 单独 ts 项目 -> 财务系统 fm
+        // if (isVite_ts) {
+        //   return { type: 'vite', port: 6002 };
+        // }
+      } catch (err) {
+        console.error(`文件处理失败: ${file}`, err);
+        return null;
+      }
+    })
+  );
+  // 排序逻辑
+  results = results.sort((a, b) => {
+    // 处理 undefined 端口为最大值
+    const portA = a.port ? parseInt(a.port) : Infinity;
+    const portB = b.port ? parseInt(b.port) : Infinity;
+    // 优先级 1: 端口号升序
+    if (portA !== portB) {
+      return portA - portB;
+    }
+
+    // 优先级 2: 名称字母序
+    return a.name.localeCompare(b.name);
   });
-  // 更新 package.json
-  const pkg = require(path.join(templatePath, "package.json"));
-  pkg.name = projectName;
-  fs.writeFileSync(path.join(targetDir, "package.json"), JSON.stringify(pkg, null, 2));
+
+  // 组合项目信息
+  const projectList = results.map((item, index) => ({
+    序号: index + 1,
+    项目名称: item.name,
+    'DevServer 端口号': item.port || '未配置',
+  }));
+  // // 格式化输出
+  if (options.list) {
+    console.log('\n\n====== 已存在的项目列表，请不要重复 ======');
+    console.table(projectList, ['序号', '项目名称', 'DevServer 端口号']);
+  }
+  return results;
+}
+
+// 更新 root -> package.json -> apps 配置
+async function updateRootPackageJson(projectName, options) {
+  const appsConfigPath = path.join(process.cwd(), 'package.json');
+
+  try {
+    // 读取配置
+    const appsConfig = await fs.readJSON(appsConfigPath);
+
+    // 初始化 apps 数组
+    appsConfig.apps = appsConfig.apps || [];
+    // 新增应用配置
+    appsConfig.apps.push({
+      name: projectName,
+      port: options.devServerPort,
+      created: new Date().toISOString(),
+    });
+    // 写入更新
+    await fs.writeJSON(appsConfigPath, appsConfig, {
+      spaces: 2,
+      replacer: null, // 保留完整数据结构
+    });
+    return true;
+  } catch (error) {
+    console.error('更新应用配置失败:', error);
+    return false;
+  }
 }

package/bin/dist/default/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>test</title>
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script type="module" src="./src/main.js"></script>
+  </body>
+</html>

package/bin/dist/default/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "test",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "description": "个人工作台",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "@element-plus/icons-vue": "^2.3.1",
+    "@wyt/components": "workspace:^",
+    "@wyt/utils": "workspace:^",
+    "element-plus": "^2.10.2",
+    "pinia": "^2.0.28",
+    "sass": "^1.89.2",
+    "vue": "^3.5.13",
+    "vue-router": "^4.5.0",
+    "wujie-polyfill": "^1.1.3",
+    "wujie-vue3": "^1.0.24"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-vue": "^5.2.1",
+    "vite": "^6.0.5"
+  }
+}

package/bin/dist/default/src/App.vue

@@ -0,0 +1,20 @@
+<template>
+  <div class="app-container">
+    <Home />
+    <router-view></router-view>
+  </div>
+</template>
+
+<script setup scoped>
+import Home from './views/Home.vue';
+</script>
+
+<style scoped>
+.app-container {
+  width: 100%;
+  height: calc(100vh - 70px);
+  background-color: #fff;
+  overflow: auto;
+  scrollbar-width: thin;
+}
+</style>

package/bin/dist/default/src/api/index.js

@@ -0,0 +1,15 @@
+/**
+ * API 接口定义文件
+ *
+ */
+import { http } from '@wyt/utils';
+
+export const api_test = (data) => {
+  return http({
+    // method: 'POST',
+    // url: '/finweb/?svr=FWS_20002',
+    data,
+  });
+};
+
+export default {};

package/bin/dist/default/src/component/TestComponent.vue

@@ -0,0 +1,5 @@
+<template>
+  <p>这是一个测试组件</p>
+</template>
+
+<script name="TestComponent" setup></script>

package/bin/dist/default/src/main.js

@@ -0,0 +1,20 @@
+import { createApp } from 'vue';
+import { createPinia } from 'pinia';
+import App from './App.vue';
+import router from './router';
+import './style.css';
+import ElementPlus from 'element-plus';
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs';
+import 'element-plus/dist/index.css';
+import wytComponents from '@wyt/components';
+import '@wyt/components/dist/themes/index.css';
+import '@wyt/components/dist/index.css';
+import '@wyt/components/dist/assets/iconfont/iconfont.css';
+import '@wyt/form-designer/dist/style.css';
+import { initAndListenTheme } from '@wyt/utils';
+
+initAndListenTheme();
+
+const app = createApp(App);
+
+app.use(createPinia()).use(wytComponents).use(router).use(ElementPlus, { locale: zhCn }).mount('#app');

package/bin/dist/default/src/router/index.js

@@ -0,0 +1,23 @@
+import { createRouter, createWebHashHistory } from 'vue-router';
+const basename = process.env.NODE_ENV === 'production' ? '/mw/' : '';
+
+const routes = [
+  // {
+  //   path: '*****',
+  //   name: '*****',
+  // },
+
+  // 404 路由配置
+  {
+    path: '/:pathMatch(.*)*',
+    name: 'NotFound',
+    component: () => import('../views/NotFound.vue'),
+  },
+];
+
+const router = createRouter({
+  history: createWebHashHistory(basename),
+  routes,
+});
+
+export default router;

package/bin/dist/default/src/style.css

@@ -0,0 +1,20 @@
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+ul {
+  list-style: none;
+}
+
+/* 重置公共样式部分 */
+.drawer-header-box {
+  padding: 0 !important;
+  margin: 0 !important;
+}
+
+.drawer-body-box {
+  padding: 0 !important;
+  margin: 0 !important;
+}

package/bin/dist/default/src/views/Home.vue

@@ -0,0 +1,8 @@
+<template>
+  <h1>这是一个测试页面</h1>
+  <TestComponent />
+</template>
+
+<script setup scoped>
+import TestComponent from './components/TestComponent.vue';
+</script>

package/bin/dist/default/src/views/NotFound.vue

@@ -0,0 +1,13 @@
+<template>
+  <div class="not-found">
+    <h1>404</h1>
+    <h2>您访问的页面不存在</h2>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.not-found {
+  text-align: center;
+  padding: 50px;
+}
+</style>

package/bin/dist/default/vite.config.js

@@ -0,0 +1,51 @@
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+const ProxyURL = process.env.VITE_API_BASE_URL;
+
+export default defineConfig({
+  base: './',
+  build: {
+    outDir: '../../dist/test',
+    emptyOutDir: true, // 清空输出目录
+  },
+  server: {
+    port: '6003',
+    open: false,
+    proxy: {
+      // 设置代理
+      '/finweb': {
+        target: ProxyURL,
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/finweb/, '/finweb'),
+        // 添加 CORS 头
+        configure: (proxy) => {
+          proxy.on('proxyRes', (proxyRes, req, res) => {
+            res.setHeader('Access-Control-Allow-Origin', req.headers.origin || '*');
+            res.setHeader('Access-Control-Allow-Credentials', 'true');
+          });
+        },
+      },
+    },
+    cors: true,
+  },
+  resolve: {
+    dedupe: ['vue', 'pinia', 'element-plus'],
+    alias: {
+      '@': '/src',
+      '@hooks': '/src/hooks/index.js',
+    },
+  },
+  plugins: [
+    vue({
+      script: {
+        defineModel: true,
+        propsDestructure: true,
+      },
+    }),
+  ],
+  css: {
+    preprocessorOptions: {
+      scss: {},
+    },
+  },
+});

package/bin/lib/const.js

@@ -1 +1 @@
-export const LOWEST_NODE_VERSION = "18.0.0"; // 最低的 node 版本
+export const LOWEST_NODE_VERSION = '18.0.0'; // 最低的 node 版本

package/bin/lib/logger.js

@@ -0,0 +1,37 @@
+import chalk from 'chalk';
+const LOG_TYPES = {
+  success: {
+    label: '成功',
+    bgColor: chalk.bgGreen,
+    textColor: chalk.green,
+  },
+  warning: {
+    label: '警告',
+    bgColor: chalk.bgYellow,
+    textColor: chalk.yellow,
+  },
+  error: {
+    label: '错误',
+    bgColor: chalk.bgRed,
+    textColor: chalk.red,
+  },
+  info: {
+    label: '信息',
+    bgColor: chalk.bgBlue,
+    textColor: chalk.blue,
+  },
+};
+export function log(type = 'info', message, customLabel) {
+  const config = LOG_TYPES[type] || LOG_TYPES.info;
+  const label = customLabel || config.label;
+  const badge = config.bgColor(label);
+  const text = config.textColor(message);
+  console.log(badge, text);
+}
+export const log_success = (msg, label) => log('success', msg, label);
+export const log_warning = (msg, label) => log('warning', msg, label);
+export const log_error = (msg, label) => log('error', msg, label);
+export const log_info = (msg, label) => log('info', msg, label); // 保持向后兼容
+export function printError(err, label) {
+  log_error(err instanceof Error ? err.message : err, label);
+}

package/bin/lib/utils.js

@@ -1,15 +1,29 @@
 // bin/lib/index.js
-import { createRequire } from "module";
-import { fileURLToPath } from "url";
-import path from "path";
+import { createRequire } from 'module';
+import { fileURLToPath } from 'url';
+import path from 'path';
 
 // 转换 URL 为系统路径
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 // 计算项目根目录（假设该文件在 bin/lib/ 下）
-export const projectRoot = path.resolve(__dirname, "../../");
+export const projectRoot = path.resolve(__dirname, '../../');
 
 // ES6 自定义 require 函数，用于读取 .json 文件信息
 // import.meta.url 的路径基准点是 当前文件所在目录（即 bin/lib/index.js）
-export const require = createRequire(projectRoot + "/");
+export const require = createRequire(projectRoot + '/');
+
+// 初始化 TS 编译器
+// require('ts-node').register({
+//   transpileOnly: true, // 禁用类型检查（提升性能）
+//   files: ['**/*.config.ts'], // 只编译配置文件
+//   compilerOptions: {
+//     moduleResolution: 'NodeNext',
+//     module: 'NodeNext',
+//   },
+// });
+// // 支持 .ts 扩展名注册 (针对旧版 Node)
+// require.extensions['ts'] = function (module, filePath) {
+//   module._compile(require('fs').readFileSync(filePath, 'utf8'), filePath);
+// };