@htyf-mp/cli 0.2.0-alpha.4 → 0.2.0-alpha.6

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@htyf-mp/cli",
-  "version": "0.2.0-alpha.4",
+  "version": "0.2.0-alpha.6",
   "description": "红糖云服app小程序模板-cli",
   "type": "module",
-  "bin": "src/index.mjs",
+  "bin": {
+    "htyf": "src/index.mjs",
+    "htyf-mp": "src/index.mjs"
+  },
   "files": [
     "src",
     "README.md"

package/src/file-system.mjs

@@ -62,6 +62,24 @@ export class FileSystemUtils {
     return Math.round(bytes / Math.pow(1024, i) * 100) / 100 + ' ' + sizes[i];
   }
 
+  /**
+   * 检查目录是否为空
+   * @param {string} dirPath
+   * @returns {boolean}
+   */
+  static isDirectoryEmpty(dirPath) {
+    if (!fs.existsSync(dirPath)) {
+      return true;
+    }
+    try {
+      const entries = fs.readdirSync(dirPath);
+      return entries.length === 0;
+    } catch (error) {
+      Logger.warn(`读取目录内容失败: ${dirPath}`, error.message);
+      return false;
+    }
+  }
+
   static validatePath(path) {
     // if (/[ -	fa5]/gi.test(path)) {
     //   return { isValid: false, error: '路径中包含中文字符' };

package/src/project-initializer.mjs

@@ -86,7 +86,7 @@ export class ProjectInitializer {
       process.removeListener('SIGTERM', handleExit);
 
       // 5. 显示成功信息
-      this.showSuccessInfo(userInputs.appName, rootPath);
+      this.showSuccessInfo(userInputs.appName, rootPath, userInputs.templateType);
 
     } catch (error) {
       process.removeListener('SIGINT', handleExit);
@@ -193,7 +193,7 @@ export class ProjectInitializer {
       const projectConfig = this.config.createProjectConfig(appName, displayName, appid);
 
       // 写入配置文件
-      const configPath = path.join(appRootPath, 'project.dgz.json');
+      const configPath = path.join(appRootPath, 'htyf.json');
       fs.writeFileSync(configPath, JSON.stringify(projectConfig, undefined, 2));
 
       // 清理临时文件
@@ -205,7 +205,19 @@ export class ProjectInitializer {
 
       // 移动到目标目录
       spinner.text = '正在创建项目目录...';
-      fse.moveSync(appRootPath, rootPath);
+
+      if (fs.existsSync(rootPath)) {
+        fse.ensureDirSync(rootPath);
+        const items = fs.readdirSync(appRootPath);
+        items.forEach((item) => {
+          const source = path.join(appRootPath, item);
+          const destination = path.join(rootPath, item);
+          fse.moveSync(source, destination, { overwrite: true });
+        });
+        fse.removeSync(appRootPath);
+      } else {
+        fse.moveSync(appRootPath, rootPath);
+      }
 
       // 清理临时目录
       fse.removeSync(tmpdir);
@@ -221,19 +233,33 @@ export class ProjectInitializer {
     }
   }
 
-  showSuccessInfo(appName, rootPath) {
+  showSuccessInfo(appName, rootPath, templateType) {
     console.log('\n' + boxen(
       gradient.rainbow('🎉 项目创建成功!') + '\n\n' +
       chalk.cyan('项目名称: ') + chalk.white(appName) + '\n' +
       chalk.cyan('项目路径: ') + chalk.white(rootPath) + '\n\n' +
       chalk.yellow('下一步操作:') + '\n' +
-      chalk.white(`  cd ${appName}`) + '\n' +
-      chalk.white('  npm install') + '\n' +
-      chalk.white('  npm run dev:weapp') + '\n\n' +
+      (() => {
+        const relativePath = path.relative(process.cwd(), rootPath);
+        const commands = [];
+        if (relativePath) {
+          commands.push(chalk.white(`  cd ${relativePath}`));
+        }
+
+        if (templateType === CONSTANTS.TEMPLATE_TYPES.GAME_TEMPLATE) {
+          commands.push(chalk.white('  npm install'));
+        } else {
+          commands.push(
+            chalk.white('  npm install'),
+            chalk.white('  npm run ios'),
+            chalk.white('  npm run android')
+          );
+        }
+
+        return commands.join('\n');
+      })() + '\n\n' +
       chalk.blue('常用命令:') + '\n' +
-      chalk.white('  npm run build:weapp  # 构建微信小程序') + '\n' +
-      chalk.white('  npm run build:h5     # 构建H5版本') + '\n' +
-      chalk.white('  npm run build:rn     # 构建React Native版本') + '\n\n' +
+      chalk.white('  npm run htyf  # 构建红糖云服小程序') + '\n' +
       chalk.gray('💡 提示: 使用 --debug 参数可以查看详细的调试信息'),
       {
         padding: 1,

package/src/template-processor.mjs

@@ -89,7 +89,7 @@ export class TemplateProcessor {
     // 复制模板文件
     Object.entries(template.files).forEach(([key, fileName]) => {
       const srcPath = path.join(tempPath, fileName);
-      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'project.dgz.json'}`);
+      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'htyf.json'}`);
 
       if (fs.existsSync(srcPath)) {
         fse.copySync(srcPath, destPath);
@@ -125,7 +125,7 @@ export class TemplateProcessor {
     // 复制模板文件
     Object.entries(template.files).forEach(([key, fileName]) => {
       const srcPath = path.join(tempPath, fileName);
-      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'project.dgz.json'}`);
+      const destPath = path.join(appRootPath, key === 'src' ? './src' : `./${key === 'app' ? 'App.tsx' : key === 'index' ? 'index.js' : key === 'babel' ? 'babel.config.js' : 'htyf.json'}`);
 
       if (fs.existsSync(srcPath)) {
         fse.copySync(srcPath, destPath);