@htyf-mp/cli 0.2.0-alpha.10 → 0.2.0-alpha.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htyf-mp/cli",
-  "version": "0.2.0-alpha.10",
+  "version": "0.2.0-alpha.11",
   "description": "红糖云服app小程序模板-cli",
   "type": "module",
   "bin": {

package/src/build.mjs

@@ -139,15 +139,11 @@ export async function mpBuildShell(newAppInfo, isGodot) {
       });
     } else {
       Logger.info('检测到 Godot 项目，开始执行 Godot 导出流程...');
-      const defaultPlatform = ['android', 'ios'].includes(CONSTANTS.BUNDLE_PLATFORM) 
-        ? CONSTANTS.BUNDLE_PLATFORM 
-        : 'ios';
       const godotDefaults = {
         targetBaseDir: outputPath,
         projectDir: guessGodotProjectDir(PROJECT_ROOT),
         name: newAppInfo.appid || 'GodotApp',
-        preset: defaultPlatform === 'android' ? 'Android' : 'iOS',
-        platform: defaultPlatform
+        preset: ''
       };
       const godotOptions = await promptGodotOptions(godotDefaults);
       outputPath = path.resolve(godotOptions.targetBaseDir);

package/src/debug.mjs

@@ -14,19 +14,19 @@ import { printQrcode } from './utils-functions.mjs';
  * 小程序真机调试
  * @param {object} newAppInfo - 应用信息
  */
-export async function mpDebugShell(newAppInfo) {
+export async function mpDebugShell(newAppInfo, isGodot) {
   try {
-    // 验证必需字段
-    if (!newAppInfo.entry) {
+    // 验证必需字段（非 Godot 项目需要 entry）
+    if (!isGodot && !newAppInfo.entry) {
       throw new Error('缺少必需的应用信息: entry');
     }
     
-    const zipPath = await mpBuildShell(newAppInfo);
+    const zipPath = await mpBuildShell(newAppInfo, isGodot);
     const assetsPath = path.dirname(zipPath);
     const appJsonPath = path.join(assetsPath, 'app.json');
 
     Logger.info(`资源路径: ${assetsPath}`);
-    const applocaljson = fse.readJsonSync(appJsonPath);
+    const applocaljson = await fse.readJson(appJsonPath);
 
     // 验证网络配置
     const networkValidation = await ConfigValidator.validateNetworkConfig();
@@ -43,26 +43,28 @@ export async function mpDebugShell(newAppInfo) {
       cwd: assetsPath
     });
 
-    const server = app.listen(function () {
+    const server = app.listen(async function () {
       const address = server.address();
 
       const debugerAppUrlConfig = `http://${host}:${address.port}/app.json`;
       const debugerZip = `http://${host}:${address.port}/dist.dgz`;
+      const { name, appid, version } = applocaljson;
       const args = {
         ...applocaljson,
         development: true,
-        "name": applocaljson.name,
-        "appid": applocaljson.appid,
-        "version": applocaljson.version,
+        name,
+        appid,
+        version,
         appUrlConfig: debugerAppUrlConfig,
         zipUrl: debugerZip,
       };
 
-      fse.writeJSONSync(appJsonPath, {
-        ...fse.readJSONSync(appJsonPath),
+      const currentAppJson = await fse.readJson(appJsonPath);
+      await fse.writeJson(appJsonPath, {
+        ...currentAppJson,
         appUrlConfig: debugerAppUrlConfig,
         zipUrl: debugerZip,
-      });
+      }, { spaces: 2 });
 
       const qrcodeUrl = `https://share.dagouzhi.com/#/pages/index/index?data=${encodeURIComponent(JSON.stringify(args))}`;
 
@@ -71,9 +73,9 @@ export async function mpDebugShell(newAppInfo) {
       console.log(boxen(
         gradient.rainbow('小程序真机调试') + '\n\n' +
         chalk.cyan('服务器地址: ') + chalk.white(`${host}:${address.port}`) + '\n' +
-        chalk.cyan('应用名称: ') + chalk.white(applocaljson.name) + '\n' +
-        chalk.cyan('应用ID: ') + chalk.white(applocaljson.appid) + '\n' +
-        chalk.cyan('版本: ') + chalk.white(applocaljson.version),
+        chalk.cyan('应用名称: ') + chalk.white(name) + '\n' +
+        chalk.cyan('应用ID: ') + chalk.white(appid) + '\n' +
+        chalk.cyan('版本: ') + chalk.white(version),
         {
           padding: 1,
           margin: 1,

package/src/export_godot.mjs

@@ -29,16 +29,22 @@ export async function promptGodotOptions(defaults = {}) {
   if (
     defaults.targetBaseDir &&
     defaults.projectDir &&
-    defaults.appid &&
-    defaults.preset &&
-    defaults.platform
+    defaults.appid 
   ) {
+    // platform 是可选的，如果不指定则默认为全部平台
+    let platform = defaults.platform || [PLATFORMS.IOS, PLATFORMS.ANDROID];
+    // 处理 'all' 的情况
+    if (platform === 'all') {
+      platform = [PLATFORMS.IOS, PLATFORMS.ANDROID];
+    } else if (!Array.isArray(platform)) {
+      platform = [platform];
+    }
     return {
       targetBaseDir: String(defaults.targetBaseDir).trim(),
       projectDir: String(defaults.projectDir).trim(),
       name: String(defaults.appid).trim(),
       preset: String(defaults.preset).trim(),
-      platform: defaults.platform
+      platform
     };
   }
 
@@ -76,19 +82,25 @@ export async function promptGodotOptions(defaults = {}) {
       name: 'platform',
       message: '请选择导出平台:',
       choices: [
+        { name: '全部 (iOS + Android)', value: 'all' },
         { name: 'iOS', value: PLATFORMS.IOS },
         { name: 'Android', value: PLATFORMS.ANDROID }
       ],
-      default: defaults.platform || 'ios'
+      default: defaults.platform || 'all'
     }
   ]);
 
+  // 将 'all' 转换为数组，单个平台也转换为数组以保持一致性
+  const platform = answers.platform === 'all' 
+    ? [PLATFORMS.IOS, PLATFORMS.ANDROID]
+    : [answers.platform];
+
   return {
     targetBaseDir: answers.targetBaseDir.trim(),
     projectDir: answers.projectDir.trim(),
     name: answers.name.trim(),
     preset: answers.preset.trim(),
-    platform: answers.platform
+    platform
   };
 }
 
@@ -202,15 +214,30 @@ export async function exportGodot(options) {
   await runGodotCommand(godotBin, importArgs);
   await runGodotCommand(godotBin, importArgs);
 
-  switch (platform) {
-    case PLATFORMS.IOS:
-      await handleIosExport({ godotBin, projectDir, preset, targetBaseDir, name });
-      break;
-    case PLATFORMS.ANDROID:
-      await handleAndroidExport({ godotBin, projectDir, preset, targetBaseDir, name });
-      break;
-    default:
-      throw new Error(`Unsupported platform: ${platform}. Supported: ${Object.values(PLATFORMS).join(', ')}`);
+  // platform 现在是数组，支持多个平台
+  // 处理 'all' 的情况和未指定的情况
+  let platforms;
+  if (platform === 'all') {
+    platforms = [PLATFORMS.IOS, PLATFORMS.ANDROID];
+  } else if (Array.isArray(platform)) {
+    platforms = platform;
+  } else if (platform) {
+    platforms = [platform];
+  } else {
+    platforms = [PLATFORMS.IOS, PLATFORMS.ANDROID];
+  }
+
+  for (const plat of platforms) {
+    switch (plat) {
+      case PLATFORMS.IOS:
+        await handleIosExport({ godotBin, projectDir, preset, targetBaseDir, name });
+        break;
+      case PLATFORMS.ANDROID:
+        await handleAndroidExport({ godotBin, projectDir, preset, targetBaseDir, name });
+        break;
+      default:
+        throw new Error(`Unsupported platform: ${plat}. Supported: ${Object.values(PLATFORMS).join(', ')}`);
+    }
   }
 }