weapp-ide-cli 5.0.1 → 5.0.3

package/README.md

@@ -55,6 +55,12 @@ weapp alipay preview --project ./dist/mp-alipay
 
 首次使用前请确认已全局安装 `minidev`（例如执行 `pnpm add -g minidev`）。若命令不存在，CLI 会给出安装提示。
 
+也支持通过 `open` 命令直接指定平台为支付宝，此时会自动转发到 `minidev ide`：
+
+```sh
+weapp open --platform alipay -p ./dist/dev/mp-alipay
+```
+
 ## 常用命令速查
 
 | 命令                                            | 说明                                 |
@@ -107,6 +113,7 @@ weapp config
 ## 常见问题
 
 - **命令执行后无反应**：请确认微信开发者工具已开启服务端口，并尝试重新登录或升级工具版本。
+- **提示 `需要重新登录` 或 `code: 10`**：表示微信开发者工具登录态失效。请先在工具内完成登录，再回到终端按 `r` 重试；按 `q`、`Esc` 或 `Ctrl+C` 可取消本次命令。
 - **提示未找到 CLI**：检查配置文件中的路径是否真实存在，可使用绝对路径避免解析误差。
 - **Linux 环境报错**：需安装社区版工具并将 `wechat-devtools-cli` 加入 `PATH`，否则只能手动指定路径。
 

package/dist/chunk-A26E3I4U.js

@@ -0,0 +1,568 @@
+// src/logger.ts
+import logger, { colors } from "@weapp-core/logger";
+var logger_default = logger;
+
+// src/utils/path.ts
+import process from "process";
+import path from "pathe";
+function resolvePath(filePath) {
+  if (path.isAbsolute(filePath)) {
+    return filePath;
+  }
+  return path.resolve(process.cwd(), filePath);
+}
+
+// src/utils/argv.ts
+import process2 from "process";
+function ensurePathArgument(argv, optionIndex) {
+  const paramIdx = optionIndex + 1;
+  const param = argv[paramIdx];
+  if (param && !param.startsWith("-")) {
+    argv[paramIdx] = resolvePath(param);
+  } else {
+    argv.splice(paramIdx, 0, process2.cwd());
+  }
+  return argv;
+}
+function transformArgv(argv, transforms) {
+  return transforms.reduce((current, transform) => transform(current), [
+    ...argv
+  ]);
+}
+function createAlias(entry) {
+  return (input2) => {
+    const argv = [...input2];
+    let optionIndex = argv.indexOf(entry.find);
+    if (optionIndex > -1) {
+      argv.splice(optionIndex, 1, entry.replacement);
+    } else {
+      optionIndex = argv.indexOf(entry.replacement);
+    }
+    if (optionIndex === -1) {
+      return argv;
+    }
+    return ensurePathArgument(argv, optionIndex);
+  };
+}
+function createPathCompat(option) {
+  return (input2) => {
+    const argv = [...input2];
+    const optionIndex = argv.indexOf(option);
+    if (optionIndex === -1) {
+      return argv;
+    }
+    return ensurePathArgument(argv, optionIndex);
+  };
+}
+
+// src/utils/exec.ts
+import process3 from "process";
+async function execute(cliPath, argv, options = {}) {
+  const {
+    pipeStdout = true,
+    pipeStderr = true
+  } = options;
+  const { execa } = await import("execa");
+  const task = execa(cliPath, argv);
+  if (pipeStdout) {
+    task?.stdout?.pipe(process3.stdout);
+  }
+  if (pipeStderr) {
+    task?.stderr?.pipe(process3.stderr);
+  }
+  return await task;
+}
+
+// src/cli/minidev.ts
+var MINIDEV_COMMAND = "minidev";
+function isCommandNotFound(error) {
+  return Boolean(
+    error && typeof error === "object" && "code" in error && error.code === "ENOENT"
+  );
+}
+async function runMinidev(argv) {
+  try {
+    await execute(MINIDEV_COMMAND, [...argv]);
+  } catch (error) {
+    if (isCommandNotFound(error)) {
+      logger_default.error("\u672A\u68C0\u6D4B\u5230\u652F\u4ED8\u5B9D\u5C0F\u7A0B\u5E8F CLI\uFF1Aminidev");
+      logger_default.warn("\u8BF7\u5148\u5B89\u88C5 minidev\uFF0C\u53EF\u4F7F\u7528\u4EE5\u4E0B\u4EFB\u4E00\u547D\u4EE4\uFF1A");
+      logger_default.info(`- ${colors.green("pnpm add -g minidev")}`);
+      logger_default.info(`- ${colors.green("npm install -g minidev")}`);
+      logger_default.info(`- ${colors.green("yarn global add minidev")}`);
+      return;
+    }
+    throw error;
+  }
+}
+
+// src/config/paths.ts
+import os from "os";
+import path2 from "pathe";
+var homedir = os.homedir();
+var defaultCustomConfigDirPath = path2.join(homedir, ".weapp-ide-cli");
+var defaultCustomConfigFilePath = path2.join(
+  defaultCustomConfigDirPath,
+  "config.json"
+);
+
+// src/config/custom.ts
+import fs from "fs-extra";
+var JSON_OPTIONS = {
+  encoding: "utf8",
+  spaces: 2
+};
+async function createCustomConfig(params) {
+  const trimmedCliPath = params.cliPath.trim();
+  if (!trimmedCliPath) {
+    throw new Error("cliPath cannot be empty");
+  }
+  const normalizedCliPath = resolvePath(trimmedCliPath);
+  await fs.ensureDir(defaultCustomConfigDirPath);
+  await fs.writeJSON(
+    defaultCustomConfigFilePath,
+    {
+      cliPath: normalizedCliPath
+    },
+    JSON_OPTIONS
+  );
+  return normalizedCliPath;
+}
+
+// src/cli/prompt.ts
+import { stdin as input, stdout as output } from "process";
+import { createInterface } from "readline/promises";
+import fs2 from "fs-extra";
+async function promptForCliPath() {
+  const rl = createInterface({ input, output });
+  try {
+    logger_default.info(`\u8BF7\u8BBE\u7F6E ${colors.bold("\u5FAE\u4FE1web\u5F00\u53D1\u8005\u5DE5\u5177 CLI")} \u7684\u8DEF\u5F84`);
+    logger_default.info("\u63D0\u793A\uFF1A\u547D\u4EE4\u884C\u5DE5\u5177\u9ED8\u8BA4\u6240\u5728\u4F4D\u7F6E\uFF1A");
+    logger_default.info(`- MacOS: ${colors.green("<\u5B89\u88C5\u8DEF\u5F84>/Contents/MacOS/cli")}`);
+    logger_default.info(`- Windows: ${colors.green("<\u5B89\u88C5\u8DEF\u5F84>/cli.bat")}`);
+    logger_default.info(`- Linux: ${colors.green("<\u5B89\u88C5\u8DEF\u5F84>/files/bin/bin/wechat-devtools-cli")}`);
+    const cliPath = (await rl.question("\u8BF7\u8F93\u5165\u5FAE\u4FE1web\u5F00\u53D1\u8005\u5DE5\u5177 CLI \u8DEF\u5F84\uFF1A")).trim();
+    if (!cliPath) {
+      logger_default.error("\u8DEF\u5F84\u4E0D\u80FD\u4E3A\u7A7A\uFF0C\u5DF2\u53D6\u6D88\u672C\u6B21\u914D\u7F6E\u3002");
+      return null;
+    }
+    try {
+      const normalizedPath = await createCustomConfig({ cliPath });
+      logger_default.info(`\u5168\u5C40\u914D\u7F6E\u5B58\u50A8\u4F4D\u7F6E\uFF1A${colors.green(defaultCustomConfigFilePath)}`);
+      if (!await fs2.pathExists(normalizedPath)) {
+        logger_default.warn("\u5728\u5F53\u524D\u8DEF\u5F84\u672A\u627E\u5230\u5FAE\u4FE1web\u5F00\u53D1\u8005\u547D\u4EE4\u884C\u5DE5\u5177\uFF0C\u8BF7\u786E\u8BA4\u8DEF\u5F84\u662F\u5426\u6B63\u786E\u3002");
+      }
+      return normalizedPath;
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : String(error);
+      logger_default.error(`\u4FDD\u5B58\u914D\u7F6E\u5931\u8D25\uFF1A${reason}`);
+      return null;
+    }
+  } finally {
+    rl.close();
+  }
+}
+
+// src/runtime/platform.ts
+import os2 from "os";
+import process4 from "process";
+import fs3 from "fs-extra";
+import path3 from "pathe";
+var SupportedPlatformsMap = {
+  Windows_NT: "Windows_NT",
+  Darwin: "Darwin",
+  Linux: "Linux"
+};
+function isOperatingSystemSupported(osName = os2.type()) {
+  return osName === SupportedPlatformsMap.Windows_NT || osName === SupportedPlatformsMap.Darwin || osName === SupportedPlatformsMap.Linux;
+}
+var operatingSystemName = os2.type();
+function createLinuxCliResolver() {
+  let resolvedPath;
+  let attempted = false;
+  let pending = null;
+  return async () => {
+    if (attempted) {
+      return resolvedPath;
+    }
+    if (!pending) {
+      pending = (async () => {
+        try {
+          const envPath = await getFirstBinaryPath("wechat-devtools-cli");
+          if (envPath) {
+            resolvedPath = envPath;
+          }
+        } catch (error) {
+          const reason = error instanceof Error ? error.message : String(error);
+          logger_default.warn(`\u83B7\u53D6 Linux wechat-devtools-cli \u8DEF\u5F84\u5931\u8D25\uFF1A${reason}`);
+        } finally {
+          attempted = true;
+        }
+        return resolvedPath;
+      })();
+    }
+    return pending;
+  };
+}
+var linuxCliResolver = createLinuxCliResolver();
+var WINDOWS_DEFAULT_CLI = "C:\\Program Files (x86)\\Tencent\\\u5FAE\u4FE1web\u5F00\u53D1\u8005\u5DE5\u5177\\cli.bat";
+var DARWIN_DEFAULT_CLI = "/Applications/wechatwebdevtools.app/Contents/MacOS/cli";
+var cliPathResolvers = {
+  [SupportedPlatformsMap.Windows_NT]: async () => WINDOWS_DEFAULT_CLI,
+  [SupportedPlatformsMap.Darwin]: async () => DARWIN_DEFAULT_CLI,
+  [SupportedPlatformsMap.Linux]: linuxCliResolver
+};
+async function getDefaultCliPath(targetOs = operatingSystemName) {
+  if (!isOperatingSystemSupported(targetOs)) {
+    return void 0;
+  }
+  const resolver = cliPathResolvers[targetOs];
+  const resolvedPath = await resolver();
+  return resolvedPath;
+}
+async function getFirstBinaryPath(command) {
+  const envPath = process4.env.PATH || "";
+  const pathDirs = envPath.split(path3.delimiter);
+  for (const dir of pathDirs) {
+    const fullPath = path3.join(dir, command);
+    try {
+      await fs3.access(fullPath, fs3.constants.X_OK);
+      return fullPath;
+    } catch {
+      continue;
+    }
+  }
+  return void 0;
+}
+
+// src/config/resolver.ts
+import fs4 from "fs-extra";
+async function getConfig() {
+  if (await fs4.pathExists(defaultCustomConfigFilePath)) {
+    try {
+      const config = await fs4.readJSON(defaultCustomConfigFilePath);
+      const cliPath = typeof config.cliPath === "string" ? config.cliPath.trim() : "";
+      if (cliPath) {
+        logger_default.info(`\u5168\u5C40\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84\uFF1A${colors.green(defaultCustomConfigFilePath)}`);
+        logger_default.info(`\u81EA\u5B9A\u4E49 CLI \u8DEF\u5F84\uFF1A${colors.green(cliPath)}`);
+        return {
+          cliPath,
+          source: "custom"
+        };
+      }
+      logger_default.warn("\u81EA\u5B9A\u4E49\u914D\u7F6E\u6587\u4EF6\u7F3A\u5C11\u6709\u6548\u7684 CLI \u8DEF\u5F84\uFF0C\u5C06\u5C1D\u8BD5\u4F7F\u7528\u9ED8\u8BA4\u8DEF\u5F84\u3002");
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : String(error);
+      logger_default.warn(`\u89E3\u6790\u81EA\u5B9A\u4E49\u914D\u7F6E\u5931\u8D25\uFF0C\u5C06\u5C1D\u8BD5\u4F7F\u7528\u9ED8\u8BA4\u8DEF\u5F84\u3002\u539F\u56E0\uFF1A${reason}`);
+    }
+  }
+  const fallbackPath = await getDefaultCliPath();
+  if (fallbackPath) {
+    return {
+      cliPath: fallbackPath,
+      source: "default"
+    };
+  }
+  return {
+    cliPath: "",
+    source: "missing"
+  };
+}
+
+// src/cli/resolver.ts
+import fs5 from "fs-extra";
+async function resolveCliPath() {
+  const config = await getConfig();
+  if (!config.cliPath) {
+    return { cliPath: null, source: config.source };
+  }
+  const exists = await fs5.pathExists(config.cliPath);
+  return {
+    cliPath: exists ? config.cliPath : null,
+    source: config.source
+  };
+}
+
+// src/cli/retry.ts
+import process5 from "process";
+import { emitKeypressEvents } from "readline";
+var LOGIN_REQUIRED_PATTERNS = [
+  /code\s*[:=]\s*10/i,
+  /需要重新登录/,
+  /need\s+re-?login/i,
+  /re-?login/i
+];
+function isWechatIdeLoginRequiredError(error) {
+  const text = extractExecutionErrorText(error);
+  if (!text) {
+    return false;
+  }
+  return LOGIN_REQUIRED_PATTERNS.some((pattern) => pattern.test(text));
+}
+function extractExecutionErrorText(error) {
+  if (!error || typeof error !== "object") {
+    return "";
+  }
+  const parts = [];
+  const candidate = error;
+  for (const field of [candidate.message, candidate.shortMessage, candidate.stderr, candidate.stdout]) {
+    if (typeof field === "string" && field.trim()) {
+      parts.push(field);
+    }
+  }
+  return parts.join("\n");
+}
+function formatWechatIdeLoginRequiredError(error) {
+  const text = extractExecutionErrorText(error);
+  const code = text.match(/code\s*[:=]\s*(\d+)/i)?.[1];
+  const message = extractLoginRequiredMessage(text);
+  const lines = ["\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u8FD4\u56DE\u767B\u5F55\u9519\u8BEF\uFF1A"];
+  if (code) {
+    lines.push(`- code: ${code}`);
+  }
+  if (message) {
+    lines.push(`- message: ${message}`);
+  }
+  if (!code && !message) {
+    lines.push("- message: \u9700\u8981\u91CD\u65B0\u767B\u5F55");
+  }
+  return lines.join("\n");
+}
+function extractLoginRequiredMessage(text) {
+  if (!text) {
+    return "";
+  }
+  if (/需要重新登录/.test(text)) {
+    return "\u9700\u8981\u91CD\u65B0\u767B\u5F55";
+  }
+  const englishMatch = text.match(/need\s+re-?login|re-?login/i);
+  if (englishMatch?.[0]) {
+    return englishMatch[0].toLowerCase();
+  }
+  const firstLine = text.split(/\r?\n/).map((line) => line.trim()).find((line) => Boolean(line) && !line.startsWith("at "));
+  if (!firstLine) {
+    return "";
+  }
+  return firstLine.replace(/^\[error\]\s*/i, "").replace(/^error\s*:\s*/i, "").slice(0, 120);
+}
+async function waitForRetryKeypress() {
+  if (!process5.stdin.isTTY) {
+    return false;
+  }
+  emitKeypressEvents(process5.stdin);
+  const hasSetRawMode = typeof process5.stdin.setRawMode === "function";
+  if (hasSetRawMode) {
+    process5.stdin.setRawMode(true);
+  }
+  process5.stdin.resume();
+  return new Promise((resolve) => {
+    const cleanup = () => {
+      process5.stdin.off("keypress", onKeypress);
+      if (hasSetRawMode) {
+        process5.stdin.setRawMode(false);
+      }
+      process5.stdin.pause();
+    };
+    const done = (value) => {
+      cleanup();
+      resolve(value);
+    };
+    const onKeypress = (_str, key) => {
+      if (!key) {
+        return;
+      }
+      if (key.ctrl && key.name === "c") {
+        done(false);
+        return;
+      }
+      if (key.name === "r") {
+        done(true);
+        return;
+      }
+      if (key.name === "q" || key.name === "escape") {
+        done(false);
+      }
+    };
+    process5.stdin.on("keypress", onKeypress);
+  });
+}
+function formatRetryHotkeyPrompt() {
+  const highlight = (key) => highlightHotkey(key);
+  return `\u6309 ${highlight("r")} \u91CD\u8BD5\uFF0C\u6309 ${highlight("q")} / ${highlight("Esc")} / ${highlight("Ctrl+C")} \u9000\u51FA\u3002`;
+}
+function highlightHotkey(key) {
+  return colors.bold(colors.green(key));
+}
+
+// src/cli/run.ts
+import process6 from "process";
+var MINIDEV_NAMESPACE = /* @__PURE__ */ new Set(["alipay", "ali", "minidev"]);
+var ALIPAY_PLATFORM_ALIASES = /* @__PURE__ */ new Set(["alipay", "ali", "minidev"]);
+var ARG_TRANSFORMS = [
+  createAlias({ find: "-p", replacement: "--project" }),
+  createPathCompat("--result-output"),
+  createPathCompat("-r"),
+  createPathCompat("--qr-output"),
+  createPathCompat("-o"),
+  createPathCompat("--info-output"),
+  createPathCompat("-i")
+];
+async function parse(argv) {
+  const head = argv[0];
+  if (head && MINIDEV_NAMESPACE.has(head)) {
+    await runMinidev(argv.slice(1));
+    return;
+  }
+  const formattedArgv = transformArgv(argv, ARG_TRANSFORMS);
+  if (shouldDelegateOpenToMinidev(formattedArgv)) {
+    await runMinidev(createMinidevOpenArgv(formattedArgv));
+    return;
+  }
+  if (!isOperatingSystemSupported(operatingSystemName)) {
+    logger_default.warn(`\u5FAE\u4FE1web\u5F00\u53D1\u8005\u5DE5\u5177\u4E0D\u652F\u6301\u5F53\u524D\u5E73\u53F0\uFF1A${operatingSystemName} !`);
+    return;
+  }
+  if (head === "config") {
+    await promptForCliPath();
+    return;
+  }
+  const { cliPath, source } = await resolveCliPath();
+  if (!cliPath) {
+    const message = source === "custom" ? "\u5728\u5F53\u524D\u81EA\u5B9A\u4E49\u8DEF\u5F84\u4E2D\u672A\u627E\u5230\u5FAE\u4FE1web\u5F00\u53D1\u8005\u547D\u4EE4\u884C\u5DE5\u5177\uFF0C\u8BF7\u91CD\u65B0\u6307\u5B9A\u8DEF\u5F84\u3002" : `\u672A\u68C0\u6D4B\u5230\u5FAE\u4FE1web\u5F00\u53D1\u8005\u547D\u4EE4\u884C\u5DE5\u5177\uFF0C\u8BF7\u6267\u884C ${colors.bold(colors.green("weapp-ide-cli config"))} \u6307\u5B9A\u8DEF\u5F84\u3002`;
+    logger_default.warn(message);
+    await promptForCliPath();
+    return;
+  }
+  await runWechatCliWithRetry(cliPath, formattedArgv);
+}
+async function runWechatCliWithRetry(cliPath, argv) {
+  let retrying = true;
+  while (retrying) {
+    try {
+      const result = await execute(cliPath, argv, {
+        pipeStdout: false,
+        pipeStderr: false
+      });
+      if (!isWechatIdeLoginRequiredError(result)) {
+        flushExecutionOutput(result);
+        return;
+      }
+      retrying = await promptLoginRetry(result);
+      if (retrying) {
+        logger_default.info("\u6B63\u5728\u91CD\u8BD5\u8FDE\u63A5\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177...");
+      }
+    } catch (error) {
+      if (!isWechatIdeLoginRequiredError(error)) {
+        throw error;
+      }
+      retrying = await promptLoginRetry(error);
+      if (retrying) {
+        logger_default.info("\u6B63\u5728\u91CD\u8BD5\u8FDE\u63A5\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177...");
+      }
+    }
+  }
+}
+async function promptLoginRetry(errorLike) {
+  logger_default.error("\u68C0\u6D4B\u5230\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u767B\u5F55\u72B6\u6001\u5931\u6548\uFF0C\u8BF7\u5148\u767B\u5F55\u540E\u91CD\u8BD5\u3002");
+  logger_default.warn("\u8BF7\u5148\u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u5B8C\u6210\u767B\u5F55\u3002");
+  logger_default.warn(formatWechatIdeLoginRequiredError(errorLike));
+  logger_default.info(formatRetryHotkeyPrompt());
+  const shouldRetry = await waitForRetryKeypress();
+  if (!shouldRetry) {
+    logger_default.info("\u5DF2\u53D6\u6D88\u91CD\u8BD5\u3002\u5B8C\u6210\u767B\u5F55\u540E\u8BF7\u91CD\u65B0\u6267\u884C\u5F53\u524D\u547D\u4EE4\u3002");
+  }
+  return shouldRetry;
+}
+function shouldDelegateOpenToMinidev(argv) {
+  if (argv[0] !== "open") {
+    return false;
+  }
+  const platform = readOptionValue(argv, "--platform");
+  if (!platform) {
+    return false;
+  }
+  return ALIPAY_PLATFORM_ALIASES.has(platform);
+}
+function createMinidevOpenArgv(argv) {
+  const nextArgv = [...argv];
+  nextArgv[0] = "ide";
+  return removeOption(nextArgv, "--platform");
+}
+function readOptionValue(argv, optionName) {
+  const optionWithEqual = `${optionName}=`;
+  for (let index = 0; index < argv.length; index += 1) {
+    const token = argv[index];
+    if (!token) {
+      continue;
+    }
+    if (token === optionName) {
+      const value = argv[index + 1];
+      return typeof value === "string" ? value.trim().toLowerCase() : void 0;
+    }
+    if (token.startsWith(optionWithEqual)) {
+      const value = token.slice(optionWithEqual.length);
+      return value.trim().toLowerCase();
+    }
+  }
+  return void 0;
+}
+function removeOption(argv, optionName) {
+  const optionWithEqual = `${optionName}=`;
+  const nextArgv = [];
+  for (let index = 0; index < argv.length; index += 1) {
+    const token = argv[index];
+    if (!token) {
+      continue;
+    }
+    if (token === optionName) {
+      const nextToken = argv[index + 1];
+      if (nextToken && !nextToken.startsWith("-")) {
+        index += 1;
+      }
+      continue;
+    }
+    if (token.startsWith(optionWithEqual)) {
+      continue;
+    }
+    nextArgv.push(token);
+  }
+  return nextArgv;
+}
+function flushExecutionOutput(result) {
+  if (!result || typeof result !== "object") {
+    return;
+  }
+  const candidate = result;
+  if (typeof candidate.stdout === "string" && candidate.stdout) {
+    process6.stdout.write(candidate.stdout);
+  }
+  if (typeof candidate.stderr === "string" && candidate.stderr) {
+    process6.stderr.write(candidate.stderr);
+  }
+}
+
+export {
+  logger_default,
+  resolvePath,
+  transformArgv,
+  createAlias,
+  createPathCompat,
+  execute,
+  runMinidev,
+  defaultCustomConfigDirPath,
+  defaultCustomConfigFilePath,
+  createCustomConfig,
+  promptForCliPath,
+  SupportedPlatformsMap,
+  isOperatingSystemSupported,
+  operatingSystemName,
+  getDefaultCliPath,
+  getConfig,
+  resolveCliPath,
+  isWechatIdeLoginRequiredError,
+  extractExecutionErrorText,
+  formatWechatIdeLoginRequiredError,
+  waitForRetryKeypress,
+  formatRetryHotkeyPrompt,
+  parse
+};

package/dist/cli.js

@@ -1,7 +1,7 @@
 import {
   logger_default,
   parse
-} from "./chunk-RQRH244E.js";
+} from "./chunk-A26E3I4U.js";
 
 // src/cli.ts
 import process from "process";

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import * as execa from 'execa';
+
 /**
  * @description 运行支付宝小程序 CLI（minidev）
  */
@@ -16,6 +18,27 @@ declare function resolveCliPath(): Promise<{
     source: ConfigSource;
 }>;
 
+/**
+ * @description 判断是否为微信开发者工具登录失效错误。
+ */
+declare function isWechatIdeLoginRequiredError(error: unknown): boolean;
+/**
+ * @description 提取执行错误文本，便于统一匹配与提示。
+ */
+declare function extractExecutionErrorText(error: unknown): string;
+/**
+ * @description 将登录失效错误格式化为更易读的摘要。
+ */
+declare function formatWechatIdeLoginRequiredError(error: unknown): string;
+/**
+ * @description 交互等待用户按键重试，按 r 重试，按 q 或 Ctrl+C 取消。
+ */
+declare function waitForRetryKeypress(): Promise<boolean>;
+/**
+ * @description 生成重试按键提示，并高亮关键热键。
+ */
+declare function formatRetryHotkeyPrompt(): string;
+
 /**
  * @description CLI 入口解析与分发
  */
@@ -107,14 +130,18 @@ declare function createAlias(entry: AliasEntry): ArgvTransform;
  */
 declare function createPathCompat(option: string): ArgvTransform;
 
+interface ExecuteOptions {
+    pipeStdout?: boolean;
+    pipeStderr?: boolean;
+}
 /**
  * @description 执行 CLI 命令并透传输出
  */
-declare function execute(cliPath: string, argv: string[]): Promise<void>;
+declare function execute(cliPath: string, argv: string[], options?: ExecuteOptions): Promise<execa.Result<{}>>;
 
 /**
  * @description 解析为绝对路径（基于当前工作目录）
  */
 declare function resolvePath(filePath: string): string;
 
-export { type ArgvTransform, type BaseConfig, type ConfigSource, type ResolvedConfig, type SupportedPlatform, SupportedPlatformsMap, createAlias, createCustomConfig, createPathCompat, defaultCustomConfigDirPath, defaultCustomConfigFilePath, execute, getConfig, getDefaultCliPath, isOperatingSystemSupported, operatingSystemName, parse, promptForCliPath, resolveCliPath, resolvePath, runMinidev, transformArgv };
+export { type ArgvTransform, type BaseConfig, type ConfigSource, type ResolvedConfig, type SupportedPlatform, SupportedPlatformsMap, createAlias, createCustomConfig, createPathCompat, defaultCustomConfigDirPath, defaultCustomConfigFilePath, execute, extractExecutionErrorText, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getConfig, getDefaultCliPath, isOperatingSystemSupported, isWechatIdeLoginRequiredError, operatingSystemName, parse, promptForCliPath, resolveCliPath, resolvePath, runMinidev, transformArgv, waitForRetryKeypress };

package/dist/index.js

@@ -6,17 +6,22 @@ import {
   defaultCustomConfigDirPath,
   defaultCustomConfigFilePath,
   execute,
+  extractExecutionErrorText,
+  formatRetryHotkeyPrompt,
+  formatWechatIdeLoginRequiredError,
   getConfig,
   getDefaultCliPath,
   isOperatingSystemSupported,
+  isWechatIdeLoginRequiredError,
   operatingSystemName,
   parse,
   promptForCliPath,
   resolveCliPath,
   resolvePath,
   runMinidev,
-  transformArgv
-} from "./chunk-RQRH244E.js";
+  transformArgv,
+  waitForRetryKeypress
+} from "./chunk-A26E3I4U.js";
 export {
   SupportedPlatformsMap,
   createAlias,
@@ -25,14 +30,19 @@ export {
   defaultCustomConfigDirPath,
   defaultCustomConfigFilePath,
   execute,
+  extractExecutionErrorText,
+  formatRetryHotkeyPrompt,
+  formatWechatIdeLoginRequiredError,
   getConfig,
   getDefaultCliPath,
   isOperatingSystemSupported,
+  isWechatIdeLoginRequiredError,
   operatingSystemName,
   parse,
   promptForCliPath,
   resolveCliPath,
   resolvePath,
   runMinidev,
-  transformArgv
+  transformArgv,
+  waitForRetryKeypress
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-ide-cli",
   "type": "module",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "让微信开发者工具，用起来更加方便！",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -65,7 +65,7 @@
     "execa": "9.6.1",
     "fs-extra": "^11.3.3",
     "pathe": "^2.0.3",
-    "@weapp-core/logger": "^3.0.3"
+    "@weapp-core/logger": "^3.1.0"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",

package/dist/chunk-RQRH244E.js

@@ -1,332 +0,0 @@
-// src/logger.ts
-import logger from "@weapp-core/logger";
-var logger_default = logger;
-
-// src/utils/path.ts
-import process from "process";
-import path from "pathe";
-function resolvePath(filePath) {
-  if (path.isAbsolute(filePath)) {
-    return filePath;
-  }
-  return path.resolve(process.cwd(), filePath);
-}
-
-// src/utils/argv.ts
-import process2 from "process";
-function ensurePathArgument(argv, optionIndex) {
-  const paramIdx = optionIndex + 1;
-  const param = argv[paramIdx];
-  if (param && !param.startsWith("-")) {
-    argv[paramIdx] = resolvePath(param);
-  } else {
-    argv.splice(paramIdx, 0, process2.cwd());
-  }
-  return argv;
-}
-function transformArgv(argv, transforms) {
-  return transforms.reduce((current, transform) => transform(current), [
-    ...argv
-  ]);
-}
-function createAlias(entry) {
-  return (input2) => {
-    const argv = [...input2];
-    let optionIndex = argv.indexOf(entry.find);
-    if (optionIndex > -1) {
-      argv.splice(optionIndex, 1, entry.replacement);
-    } else {
-      optionIndex = argv.indexOf(entry.replacement);
-    }
-    if (optionIndex === -1) {
-      return argv;
-    }
-    return ensurePathArgument(argv, optionIndex);
-  };
-}
-function createPathCompat(option) {
-  return (input2) => {
-    const argv = [...input2];
-    const optionIndex = argv.indexOf(option);
-    if (optionIndex === -1) {
-      return argv;
-    }
-    return ensurePathArgument(argv, optionIndex);
-  };
-}
-
-// src/utils/exec.ts
-import process3 from "process";
-async function execute(cliPath, argv) {
-  const { execa } = await import("execa");
-  const task = execa(cliPath, argv);
-  task?.stdout?.pipe(process3.stdout);
-  task?.stderr?.pipe(process3.stderr);
-  await task;
-}
-
-// src/cli/minidev.ts
-var MINIDEV_COMMAND = "minidev";
-function isCommandNotFound(error) {
-  return Boolean(
-    error && typeof error === "object" && "code" in error && error.code === "ENOENT"
-  );
-}
-async function runMinidev(argv) {
-  try {
-    await execute(MINIDEV_COMMAND, [...argv]);
-  } catch (error) {
-    if (isCommandNotFound(error)) {
-      logger_default.error("\u672A\u68C0\u6D4B\u5230\u652F\u4ED8\u5B9D\u5C0F\u7A0B\u5E8F CLI\uFF1Aminidev");
-      logger_default.log("\u8BF7\u5148\u5B89\u88C5 minidev\uFF0C\u53EF\u4F7F\u7528\u4EE5\u4E0B\u4EFB\u4E00\u547D\u4EE4\uFF1A");
-      logger_default.log("- pnpm add -g minidev");
-      logger_default.log("- npm install -g minidev");
-      logger_default.log("- yarn global add minidev");
-      return;
-    }
-    throw error;
-  }
-}
-
-// src/config/paths.ts
-import os from "os";
-import path2 from "pathe";
-var homedir = os.homedir();
-var defaultCustomConfigDirPath = path2.join(homedir, ".weapp-ide-cli");
-var defaultCustomConfigFilePath = path2.join(
-  defaultCustomConfigDirPath,
-  "config.json"
-);
-
-// src/config/custom.ts
-import fs from "fs-extra";
-var JSON_OPTIONS = {
-  encoding: "utf8",
-  spaces: 2
-};
-async function createCustomConfig(params) {
-  const trimmedCliPath = params.cliPath.trim();
-  if (!trimmedCliPath) {
-    throw new Error("cliPath cannot be empty");
-  }
-  const normalizedCliPath = resolvePath(trimmedCliPath);
-  await fs.ensureDir(defaultCustomConfigDirPath);
-  await fs.writeJSON(
-    defaultCustomConfigFilePath,
-    {
-      cliPath: normalizedCliPath
-    },
-    JSON_OPTIONS
-  );
-  return normalizedCliPath;
-}
-
-// src/cli/prompt.ts
-import { stdin as input, stdout as output } from "process";
-import { createInterface } from "readline/promises";
-import fs2 from "fs-extra";
-async function promptForCliPath() {
-  const rl = createInterface({ input, output });
-  try {
-    logger_default.log("\u8BF7\u8BBE\u7F6E\u5FAE\u4FE1web\u5F00\u53D1\u8005\u5DE5\u5177 CLI \u7684\u8DEF\u5F84");
-    logger_default.log("> \u63D0\u793A\uFF1A\u547D\u4EE4\u884C\u5DE5\u5177\u9ED8\u8BA4\u6240\u5728\u4F4D\u7F6E\uFF1A");
-    logger_default.log("- MacOS: <\u5B89\u88C5\u8DEF\u5F84>/Contents/MacOS/cli");
-    logger_default.log("- Windows: <\u5B89\u88C5\u8DEF\u5F84>/cli.bat");
-    logger_default.log("- Linux: <\u5B89\u88C5\u8DEF\u5F84>/files/bin/bin/wechat-devtools-cli");
-    const cliPath = (await rl.question("\u8BF7\u8F93\u5165\u5FAE\u4FE1web\u5F00\u53D1\u8005\u5DE5\u5177 CLI \u8DEF\u5F84\uFF1A")).trim();
-    if (!cliPath) {
-      logger_default.error("\u8DEF\u5F84\u4E0D\u80FD\u4E3A\u7A7A\uFF0C\u5DF2\u53D6\u6D88\u672C\u6B21\u914D\u7F6E\u3002");
-      return null;
-    }
-    try {
-      const normalizedPath = await createCustomConfig({ cliPath });
-      logger_default.log(`\u5168\u5C40\u914D\u7F6E\u5B58\u50A8\u4F4D\u7F6E\uFF1A${defaultCustomConfigFilePath}`);
-      if (!await fs2.pathExists(normalizedPath)) {
-        logger_default.warn("\u5728\u5F53\u524D\u8DEF\u5F84\u672A\u627E\u5230\u5FAE\u4FE1web\u5F00\u53D1\u8005\u547D\u4EE4\u884C\u5DE5\u5177\uFF0C\u8BF7\u786E\u8BA4\u8DEF\u5F84\u662F\u5426\u6B63\u786E\u3002");
-      }
-      return normalizedPath;
-    } catch (error) {
-      const reason = error instanceof Error ? error.message : String(error);
-      logger_default.error(`\u4FDD\u5B58\u914D\u7F6E\u5931\u8D25\uFF1A${reason}`);
-      return null;
-    }
-  } finally {
-    rl.close();
-  }
-}
-
-// src/runtime/platform.ts
-import os2 from "os";
-import process4 from "process";
-import fs3 from "fs-extra";
-import path3 from "pathe";
-var SupportedPlatformsMap = {
-  Windows_NT: "Windows_NT",
-  Darwin: "Darwin",
-  Linux: "Linux"
-};
-function isOperatingSystemSupported(osName = os2.type()) {
-  return osName === SupportedPlatformsMap.Windows_NT || osName === SupportedPlatformsMap.Darwin || osName === SupportedPlatformsMap.Linux;
-}
-var operatingSystemName = os2.type();
-function createLinuxCliResolver() {
-  let resolvedPath;
-  let attempted = false;
-  let pending = null;
-  return async () => {
-    if (attempted) {
-      return resolvedPath;
-    }
-    if (!pending) {
-      pending = (async () => {
-        try {
-          const envPath = await getFirstBinaryPath("wechat-devtools-cli");
-          if (envPath) {
-            resolvedPath = envPath;
-          }
-        } catch (error) {
-          const reason = error instanceof Error ? error.message : String(error);
-          logger_default.warn(`\u83B7\u53D6 Linux wechat-devtools-cli \u8DEF\u5F84\u5931\u8D25\uFF1A${reason}`);
-        } finally {
-          attempted = true;
-        }
-        return resolvedPath;
-      })();
-    }
-    return pending;
-  };
-}
-var linuxCliResolver = createLinuxCliResolver();
-var WINDOWS_DEFAULT_CLI = "C:\\Program Files (x86)\\Tencent\\\u5FAE\u4FE1web\u5F00\u53D1\u8005\u5DE5\u5177\\cli.bat";
-var DARWIN_DEFAULT_CLI = "/Applications/wechatwebdevtools.app/Contents/MacOS/cli";
-var cliPathResolvers = {
-  [SupportedPlatformsMap.Windows_NT]: async () => WINDOWS_DEFAULT_CLI,
-  [SupportedPlatformsMap.Darwin]: async () => DARWIN_DEFAULT_CLI,
-  [SupportedPlatformsMap.Linux]: linuxCliResolver
-};
-async function getDefaultCliPath(targetOs = operatingSystemName) {
-  if (!isOperatingSystemSupported(targetOs)) {
-    return void 0;
-  }
-  const resolver = cliPathResolvers[targetOs];
-  const resolvedPath = await resolver();
-  return resolvedPath;
-}
-async function getFirstBinaryPath(command) {
-  const envPath = process4.env.PATH || "";
-  const pathDirs = envPath.split(path3.delimiter);
-  for (const dir of pathDirs) {
-    const fullPath = path3.join(dir, command);
-    try {
-      await fs3.access(fullPath, fs3.constants.X_OK);
-      return fullPath;
-    } catch {
-      continue;
-    }
-  }
-  return void 0;
-}
-
-// src/config/resolver.ts
-import fs4 from "fs-extra";
-async function getConfig() {
-  if (await fs4.pathExists(defaultCustomConfigFilePath)) {
-    try {
-      const config = await fs4.readJSON(defaultCustomConfigFilePath);
-      const cliPath = typeof config.cliPath === "string" ? config.cliPath.trim() : "";
-      if (cliPath) {
-        logger_default.log("> \u5168\u5C40\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84\uFF1A", defaultCustomConfigFilePath);
-        logger_default.log("> \u81EA\u5B9A\u4E49 CLI \u8DEF\u5F84\uFF1A", cliPath);
-        return {
-          cliPath,
-          source: "custom"
-        };
-      }
-      logger_default.warn("\u81EA\u5B9A\u4E49\u914D\u7F6E\u6587\u4EF6\u7F3A\u5C11\u6709\u6548\u7684 CLI \u8DEF\u5F84\uFF0C\u5C06\u5C1D\u8BD5\u4F7F\u7528\u9ED8\u8BA4\u8DEF\u5F84\u3002");
-    } catch (error) {
-      const reason = error instanceof Error ? error.message : String(error);
-      logger_default.warn(`\u89E3\u6790\u81EA\u5B9A\u4E49\u914D\u7F6E\u5931\u8D25\uFF0C\u5C06\u5C1D\u8BD5\u4F7F\u7528\u9ED8\u8BA4\u8DEF\u5F84\u3002\u539F\u56E0\uFF1A${reason}`);
-    }
-  }
-  const fallbackPath = await getDefaultCliPath();
-  if (fallbackPath) {
-    return {
-      cliPath: fallbackPath,
-      source: "default"
-    };
-  }
-  return {
-    cliPath: "",
-    source: "missing"
-  };
-}
-
-// src/cli/resolver.ts
-import fs5 from "fs-extra";
-async function resolveCliPath() {
-  const config = await getConfig();
-  if (!config.cliPath) {
-    return { cliPath: null, source: config.source };
-  }
-  const exists = await fs5.pathExists(config.cliPath);
-  return {
-    cliPath: exists ? config.cliPath : null,
-    source: config.source
-  };
-}
-
-// src/cli/run.ts
-var ARG_TRANSFORMS = [
-  createAlias({ find: "-p", replacement: "--project" }),
-  createPathCompat("--result-output"),
-  createPathCompat("-r"),
-  createPathCompat("--qr-output"),
-  createPathCompat("-o"),
-  createPathCompat("--info-output"),
-  createPathCompat("-i")
-];
-async function parse(argv) {
-  const head = argv[0];
-  if (head && ["alipay", "ali", "minidev"].includes(head)) {
-    await runMinidev(argv.slice(1));
-    return;
-  }
-  if (!isOperatingSystemSupported(operatingSystemName)) {
-    logger_default.log(`\u5FAE\u4FE1web\u5F00\u53D1\u8005\u5DE5\u5177\u4E0D\u652F\u6301\u5F53\u524D\u5E73\u53F0\uFF1A${operatingSystemName} !`);
-    return;
-  }
-  if (head === "config") {
-    await promptForCliPath();
-    return;
-  }
-  const { cliPath, source } = await resolveCliPath();
-  if (!cliPath) {
-    const message = source === "custom" ? "\u5728\u5F53\u524D\u81EA\u5B9A\u4E49\u8DEF\u5F84\u4E2D\u672A\u627E\u5230\u5FAE\u4FE1web\u5F00\u53D1\u8005\u547D\u4EE4\u884C\u5DE5\u5177\uFF0C\u8BF7\u91CD\u65B0\u6307\u5B9A\u8DEF\u5F84\u3002" : "\u672A\u68C0\u6D4B\u5230\u5FAE\u4FE1web\u5F00\u53D1\u8005\u547D\u4EE4\u884C\u5DE5\u5177\uFF0C\u8BF7\u6267\u884C `weapp-ide-cli config` \u6307\u5B9A\u8DEF\u5F84\u3002";
-    logger_default.log(message);
-    await promptForCliPath();
-    return;
-  }
-  const formattedArgv = transformArgv(argv, ARG_TRANSFORMS);
-  await execute(cliPath, formattedArgv);
-}
-
-export {
-  logger_default,
-  resolvePath,
-  transformArgv,
-  createAlias,
-  createPathCompat,
-  execute,
-  runMinidev,
-  defaultCustomConfigDirPath,
-  defaultCustomConfigFilePath,
-  createCustomConfig,
-  promptForCliPath,
-  SupportedPlatformsMap,
-  isOperatingSystemSupported,
-  operatingSystemName,
-  getDefaultCliPath,
-  getConfig,
-  resolveCliPath,
-  parse
-};