@aipanel/core 1.2.26 → 1.2.27

package/es/node/diagnostics.mjs

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { exec } from "node:child_process";
+import { execa } from "execa";
 import { createRequire } from "node:module";
 import { SEVERITY_ERROR, SEVERITY_WARN } from "../common/constants.mjs";
 import { createLogger } from "./node-logger.mjs";
@@ -189,41 +189,35 @@ function parseOxlintOutput(stdout, cwd) {
 async function runOxlintFiles(pattern, cwd, warnLimit) {
   const bin = resolveOxlintBin(cwd);
   if (!bin) return {};
-  return new Promise((resolve) => {
-    exec(
-      // 与 ESLint 默认行为对齐：忽略 node_modules（oxlint 默认不排除）
-      `node "${bin}" --format=json --ignore-pattern node_modules "${pattern}"`,
-      { cwd, timeout: 6e4, maxBuffer: 50 * 1024 * 1024 },
-      (error, stdout, stderr) => {
-        const killed = error?.killed;
-        if (killed) {
-          log.warn("oxlint timed out", { pattern });
-          resolve({
-            text: "[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A\u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u3002",
-            diagnostics: [],
-            engines: ["oxlint"]
-          });
-          return;
-        }
-        try {
-          const messages = parseOxlintOutput(stdout, cwd);
-          log.debug("oxlint lint", {
-            pattern,
-            messageCount: messages.length,
-            stderr: stderr || void 0
-          });
-          resolve(formatLintMessages(messages, { label: "oxlint", source: "oxlint" }, warnLimit));
-        } catch (e) {
-          log.warn("oxlint failed", { pattern, error: e.message });
-          resolve({
-            text: `[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A${e.message}`,
-            diagnostics: [],
-            engines: ["oxlint"]
-          });
-        }
-      }
-    );
-  });
+  const result = await execa(
+    "node",
+    [bin, "--format=json", "--ignore-pattern", "node_modules", pattern],
+    { cwd, timeout: 6e4, maxBuffer: 50 * 1024 * 1024, reject: false }
+  );
+  if (result.timedOut || result.isTerminated || result.isMaxBuffer) {
+    log.warn("oxlint timed out", { pattern });
+    return {
+      text: "[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A\u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u3002",
+      diagnostics: [],
+      engines: ["oxlint"]
+    };
+  }
+  try {
+    const messages = parseOxlintOutput(result.stdout, cwd);
+    log.debug("oxlint lint", {
+      pattern,
+      messageCount: messages.length,
+      stderr: result.stderr || void 0
+    });
+    return formatLintMessages(messages, { label: "oxlint", source: "oxlint" }, warnLimit);
+  } catch (e) {
+    log.warn("oxlint failed", { pattern, error: e.message });
+    return {
+      text: `[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A${e.message}`,
+      diagnostics: [],
+      engines: ["oxlint"]
+    };
+  }
 }
 let _vueTscBin;
 function resolveVueTscBin() {
@@ -364,45 +358,43 @@ async function runTypeCheck(filePath, cwd) {
   }
   const timeout = filePath ? 6e4 : 12e4;
   const maxBuffer = filePath ? 10 * 1024 * 1024 : 50 * 1024 * 1024;
-  return new Promise((resolve) => {
-    exec(
-      `node "${engine.bin}" --build --noEmit --pretty false`,
-      { cwd: projectDir, timeout, maxBuffer },
-      (error, stdout, stderr) => {
-        let rawOutput = stdout + stderr;
-        const killed = error?.killed;
-        const exitCode = typeof error?.code === "number" ? error.code : killed ? 1 : 0;
-        if (killed && !rawOutput) {
-          rawOutput = `${engine.source} \u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u6216\u4F18\u5316\u9879\u76EE\u914D\u7F6E\u3002`;
-        }
-        const diagnostics = parseTscDiags(rawOutput, filePath, projectDir, engine.source);
-        if (filePath) {
-          const resolved = path.resolve(filePath);
-          const errorLinePat = /^(.+?)\((\d+),(\d+)\):\s+(error|warning)\s+TS\d+:/;
-          const lines = rawOutput.split("\n");
-          const filtered = [];
-          let keep = false;
-          for (const line of lines) {
-            const m = errorLinePat.exec(line);
-            if (m) {
-              keep = path.resolve(projectDir, m[1]) === resolved;
-            } else if (!/^\s/.test(line)) {
-              keep = false;
-            }
-            if (keep) filtered.push(line);
-          }
-          rawOutput = filtered.join("\n");
-        }
-        log.debug("type-check finished", {
-          engine: engine.source,
-          filePath: filePath || "(all)",
-          exitCode,
-          outputLength: rawOutput.length
-        });
-        resolve({ rawOutput, exitCode, diagnostics, source: engine.source });
+  const result = await execa("node", [engine.bin, "--build", "--noEmit", "--pretty", "false"], {
+    cwd: projectDir,
+    timeout,
+    maxBuffer,
+    reject: false
+  });
+  let rawOutput = result.stdout + result.stderr;
+  const killed = result.timedOut || result.isTerminated || result.isMaxBuffer;
+  const exitCode = typeof result.exitCode === "number" ? result.exitCode : killed ? 1 : 0;
+  if (killed && !rawOutput) {
+    rawOutput = `${engine.source} \u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u6216\u4F18\u5316\u9879\u76EE\u914D\u7F6E\u3002`;
+  }
+  const diagnostics = parseTscDiags(rawOutput, filePath, projectDir, engine.source);
+  if (filePath) {
+    const resolved = path.resolve(filePath);
+    const errorLinePat = /^(.+?)\((\d+),(\d+)\):\s+(error|warning)\s+TS\d+:/;
+    const lines = rawOutput.split("\n");
+    const filtered = [];
+    let keep = false;
+    for (const line of lines) {
+      const m = errorLinePat.exec(line);
+      if (m) {
+        keep = path.resolve(projectDir, m[1]) === resolved;
+      } else if (!/^\s/.test(line)) {
+        keep = false;
       }
-    );
+      if (keep) filtered.push(line);
+    }
+    rawOutput = filtered.join("\n");
+  }
+  log.debug("type-check finished", {
+    engine: engine.source,
+    filePath: filePath || "(all)",
+    exitCode,
+    outputLength: rawOutput.length
   });
+  return { rawOutput, exitCode, diagnostics, source: engine.source };
 }
 async function runAllChecks(pattern, cwd) {
   log.debug("runAllChecks", { pattern, cwd });

package/es/node/node-utils.mjs

@@ -1,4 +1,5 @@
 import { spawn } from "node:child_process";
+import { execa } from "execa";
 import { createRequire } from "node:module";
 import fs from "node:fs";
 import http from "node:http";
@@ -124,40 +125,18 @@ function findGitRoot(startDir, maxDepth = 10) {
 }
 async function checkCliInstalled(bin) {
   const timer = new PerformanceTimer(`checkCliInstalled:${bin}`);
-  return new Promise((resolve) => {
-    const proc = spawn(bin, ["--version"], { stdio: "ignore", shell: true });
-    proc.on("close", (code) => {
-      const installed = code === 0;
-      timer.end(installed ? `\u2713 ${bin} is installed` : `\u2716 ${bin} not found`);
-      resolve(installed);
-    });
-    proc.on("error", (err) => {
-      log.debug(`Failed to check ${bin} installation`, { error: err.message });
-      timer.end("\u2716 Check failed");
-      resolve(false);
-    });
-  });
+  const result = await execa(bin, ["--version"], { reject: false, stdio: "ignore" });
+  const installed = result.exitCode === 0;
+  if (!installed && result.exitCode === void 0) {
+    log.debug(`Failed to check ${bin} installation`, { error: result.message });
+  }
+  timer.end(installed ? `\u2713 ${bin} is installed` : `\u2716 ${bin} not found`);
+  return installed;
 }
-function getCliVersion(bin) {
-  return new Promise((resolve) => {
-    const proc = spawn(bin, ["--version"], { stdio: "pipe", shell: true });
-    let stdout = "";
-    let stderr = "";
-    proc.stdout?.on("data", (data) => {
-      stdout += data.toString();
-    });
-    proc.stderr?.on("data", (data) => {
-      stderr += data.toString();
-    });
-    proc.on("close", (code) => {
-      if (code !== 0) {
-        resolve(null);
-        return;
-      }
-      resolve(stdout.trim() || stderr.trim() || null);
-    });
-    proc.on("error", () => resolve(null));
-  });
+async function getCliVersion(bin) {
+  const result = await execa(bin, ["--version"], { reject: false });
+  if (result.exitCode !== 0) return null;
+  return result.stdout.trim() || result.stderr.trim() || null;
 }
 function killOrphanCliProcesses(bin, options) {
   const label = options.label ?? bin;

package/lib/node/diagnostics.cjs

@@ -42,7 +42,7 @@ __export(diagnostics_exports, {
 module.exports = __toCommonJS(diagnostics_exports);
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = __toESM(require("node:path"));
-var import_node_child_process = require("node:child_process");
+var import_execa = require("execa");
 var import_node_module = require("node:module");
 var import_constants = require("../common/constants.cjs");
 var import_node_logger = require("./node-logger.cjs");
@@ -232,41 +232,35 @@ function parseOxlintOutput(stdout, cwd) {
 async function runOxlintFiles(pattern, cwd, warnLimit) {
   const bin = resolveOxlintBin(cwd);
   if (!bin) return {};
-  return new Promise((resolve) => {
-    (0, import_node_child_process.exec)(
-      // 与 ESLint 默认行为对齐：忽略 node_modules（oxlint 默认不排除）
-      `node "${bin}" --format=json --ignore-pattern node_modules "${pattern}"`,
-      { cwd, timeout: 6e4, maxBuffer: 50 * 1024 * 1024 },
-      (error, stdout, stderr) => {
-        const killed = error?.killed;
-        if (killed) {
-          log.warn("oxlint timed out", { pattern });
-          resolve({
-            text: "[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A\u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u3002",
-            diagnostics: [],
-            engines: ["oxlint"]
-          });
-          return;
-        }
-        try {
-          const messages = parseOxlintOutput(stdout, cwd);
-          log.debug("oxlint lint", {
-            pattern,
-            messageCount: messages.length,
-            stderr: stderr || void 0
-          });
-          resolve(formatLintMessages(messages, { label: "oxlint", source: "oxlint" }, warnLimit));
-        } catch (e) {
-          log.warn("oxlint failed", { pattern, error: e.message });
-          resolve({
-            text: `[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A${e.message}`,
-            diagnostics: [],
-            engines: ["oxlint"]
-          });
-        }
-      }
-    );
-  });
+  const result = await (0, import_execa.execa)(
+    "node",
+    [bin, "--format=json", "--ignore-pattern", "node_modules", pattern],
+    { cwd, timeout: 6e4, maxBuffer: 50 * 1024 * 1024, reject: false }
+  );
+  if (result.timedOut || result.isTerminated || result.isMaxBuffer) {
+    log.warn("oxlint timed out", { pattern });
+    return {
+      text: "[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A\u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u3002",
+      diagnostics: [],
+      engines: ["oxlint"]
+    };
+  }
+  try {
+    const messages = parseOxlintOutput(result.stdout, cwd);
+    log.debug("oxlint lint", {
+      pattern,
+      messageCount: messages.length,
+      stderr: result.stderr || void 0
+    });
+    return formatLintMessages(messages, { label: "oxlint", source: "oxlint" }, warnLimit);
+  } catch (e) {
+    log.warn("oxlint failed", { pattern, error: e.message });
+    return {
+      text: `[oxlint] \u8FD0\u884C\u5931\u8D25\uFF1A${e.message}`,
+      diagnostics: [],
+      engines: ["oxlint"]
+    };
+  }
 }
 let _vueTscBin;
 function resolveVueTscBin() {
@@ -407,45 +401,43 @@ async function runTypeCheck(filePath, cwd) {
   }
   const timeout = filePath ? 6e4 : 12e4;
   const maxBuffer = filePath ? 10 * 1024 * 1024 : 50 * 1024 * 1024;
-  return new Promise((resolve) => {
-    (0, import_node_child_process.exec)(
-      `node "${engine.bin}" --build --noEmit --pretty false`,
-      { cwd: projectDir, timeout, maxBuffer },
-      (error, stdout, stderr) => {
-        let rawOutput = stdout + stderr;
-        const killed = error?.killed;
-        const exitCode = typeof error?.code === "number" ? error.code : killed ? 1 : 0;
-        if (killed && !rawOutput) {
-          rawOutput = `${engine.source} \u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u6216\u4F18\u5316\u9879\u76EE\u914D\u7F6E\u3002`;
-        }
-        const diagnostics = parseTscDiags(rawOutput, filePath, projectDir, engine.source);
-        if (filePath) {
-          const resolved = import_node_path.default.resolve(filePath);
-          const errorLinePat = /^(.+?)\((\d+),(\d+)\):\s+(error|warning)\s+TS\d+:/;
-          const lines = rawOutput.split("\n");
-          const filtered = [];
-          let keep = false;
-          for (const line of lines) {
-            const m = errorLinePat.exec(line);
-            if (m) {
-              keep = import_node_path.default.resolve(projectDir, m[1]) === resolved;
-            } else if (!/^\s/.test(line)) {
-              keep = false;
-            }
-            if (keep) filtered.push(line);
-          }
-          rawOutput = filtered.join("\n");
-        }
-        log.debug("type-check finished", {
-          engine: engine.source,
-          filePath: filePath || "(all)",
-          exitCode,
-          outputLength: rawOutput.length
-        });
-        resolve({ rawOutput, exitCode, diagnostics, source: engine.source });
+  const result = await (0, import_execa.execa)("node", [engine.bin, "--build", "--noEmit", "--pretty", "false"], {
+    cwd: projectDir,
+    timeout,
+    maxBuffer,
+    reject: false
+  });
+  let rawOutput = result.stdout + result.stderr;
+  const killed = result.timedOut || result.isTerminated || result.isMaxBuffer;
+  const exitCode = typeof result.exitCode === "number" ? result.exitCode : killed ? 1 : 0;
+  if (killed && !rawOutput) {
+    rawOutput = `${engine.source} \u68C0\u67E5\u8D85\u65F6\uFF0C\u8BF7\u5C1D\u8BD5\u7F29\u5C0F\u68C0\u67E5\u8303\u56F4\u6216\u4F18\u5316\u9879\u76EE\u914D\u7F6E\u3002`;
+  }
+  const diagnostics = parseTscDiags(rawOutput, filePath, projectDir, engine.source);
+  if (filePath) {
+    const resolved = import_node_path.default.resolve(filePath);
+    const errorLinePat = /^(.+?)\((\d+),(\d+)\):\s+(error|warning)\s+TS\d+:/;
+    const lines = rawOutput.split("\n");
+    const filtered = [];
+    let keep = false;
+    for (const line of lines) {
+      const m = errorLinePat.exec(line);
+      if (m) {
+        keep = import_node_path.default.resolve(projectDir, m[1]) === resolved;
+      } else if (!/^\s/.test(line)) {
+        keep = false;
       }
-    );
+      if (keep) filtered.push(line);
+    }
+    rawOutput = filtered.join("\n");
+  }
+  log.debug("type-check finished", {
+    engine: engine.source,
+    filePath: filePath || "(all)",
+    exitCode,
+    outputLength: rawOutput.length
   });
+  return { rawOutput, exitCode, diagnostics, source: engine.source };
 }
 async function runAllChecks(pattern, cwd) {
   log.debug("runAllChecks", { pattern, cwd });

package/lib/node/node-utils.cjs

@@ -40,6 +40,7 @@ __export(node_utils_exports, {
 });
 module.exports = __toCommonJS(node_utils_exports);
 var import_node_child_process = require("node:child_process");
+var import_execa = require("execa");
 var import_node_module = require("node:module");
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_http = __toESM(require("node:http"));
@@ -161,40 +162,18 @@ function findGitRoot(startDir, maxDepth = 10) {
 }
 async function checkCliInstalled(bin) {
   const timer = new import_node_logger.PerformanceTimer(`checkCliInstalled:${bin}`);
-  return new Promise((resolve) => {
-    const proc = (0, import_node_child_process.spawn)(bin, ["--version"], { stdio: "ignore", shell: true });
-    proc.on("close", (code) => {
-      const installed = code === 0;
-      timer.end(installed ? `\u2713 ${bin} is installed` : `\u2716 ${bin} not found`);
-      resolve(installed);
-    });
-    proc.on("error", (err) => {
-      log.debug(`Failed to check ${bin} installation`, { error: err.message });
-      timer.end("\u2716 Check failed");
-      resolve(false);
-    });
-  });
+  const result = await (0, import_execa.execa)(bin, ["--version"], { reject: false, stdio: "ignore" });
+  const installed = result.exitCode === 0;
+  if (!installed && result.exitCode === void 0) {
+    log.debug(`Failed to check ${bin} installation`, { error: result.message });
+  }
+  timer.end(installed ? `\u2713 ${bin} is installed` : `\u2716 ${bin} not found`);
+  return installed;
 }
-function getCliVersion(bin) {
-  return new Promise((resolve) => {
-    const proc = (0, import_node_child_process.spawn)(bin, ["--version"], { stdio: "pipe", shell: true });
-    let stdout = "";
-    let stderr = "";
-    proc.stdout?.on("data", (data) => {
-      stdout += data.toString();
-    });
-    proc.stderr?.on("data", (data) => {
-      stderr += data.toString();
-    });
-    proc.on("close", (code) => {
-      if (code !== 0) {
-        resolve(null);
-        return;
-      }
-      resolve(stdout.trim() || stderr.trim() || null);
-    });
-    proc.on("error", () => resolve(null));
-  });
+async function getCliVersion(bin) {
+  const result = await (0, import_execa.execa)(bin, ["--version"], { reject: false });
+  if (result.exitCode !== 0) return null;
+  return result.stdout.trim() || result.stderr.trim() || null;
 }
 function killOrphanCliProcesses(bin, options) {
   const label = options.label ?? bin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aipanel/core",
-  "version": "1.2.26",
+  "version": "1.2.27",
   "type": "module",
   "sideEffects": false,
   "main": "lib/index.cjs",
@@ -32,6 +32,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
+    "execa": "^9.6.1",
     "vue-tsc": "^3.3.9"
   },
   "scripts": {