@cnbcool/cnb-cli 1.2.3 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnbcool/cnb-cli",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "CNB OpenAPI 命令行工具，基于 CNB 平台 Swagger 自动生成，支持 Issues、PR、Git、组织管理等全部 API 操作",
   "main": "skills/cnb-api/scripts/core/index.js",
   "bin": {
@@ -37,6 +37,6 @@
     "skills": "^1.4.4"
   },
   "dependencies": {
-    "@cnbcool/cnb-api-generate": "^2.2.0"
+    "@cnbcool/cnb-api-generate": "^2.2.1"
   }
 }

package/skills/cnb-api/scripts/core/lib/execute-action.js

@@ -11,6 +11,32 @@ var _upload = require("../utils/upload");
 var _formatParams = require("./format-params");
 var _formatOutput = require("./format-output");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+/**
+ * 加载 tool 模块并返回其 default 导出函数
+ */
+function loadToolFunction(moduleName, toolName) {
+  const toolPath = _path.default.join(__dirname, '../../modules', `${moduleName}/${toolName}.js`);
+  if (!_fs.default.existsSync(toolPath)) {
+    console.error(`工具文件不存在: ${toolPath}`);
+    process.exit(1);
+  }
+  const toolModule = require(toolPath);
+  const toolFunction = toolModule.default;
+  if (!toolFunction) {
+    console.error(`工具函数不存在`);
+    process.exit(1);
+  }
+  return toolFunction;
+}
+
+/**
+ * 处理上传命令的独立分支
+ * 上传命令只需要 --file 和自动注入的 path 参数，不经过 formatParams
+ */
+async function executeUpload(shortcut, opts) {
+  const toolFunction = loadToolFunction(shortcut.module, shortcut.tool);
+  return (0, _upload.handleUpload)(shortcut, opts.file, toolFunction, shortcut.autoPath);
+}
 async function executeAction(moduleArg, toolArg, opts, parentCmd) {
   // Commander 已解析好所有 option，直接构建 params
   const params = {};
@@ -49,18 +75,17 @@ async function executeAction(moduleArg, toolArg, opts, parentCmd) {
   if (!params.tool) {
     parentCmd.help();
   }
-  const formattedParams = (0, _formatParams.formatParams)(params);
-  const toolPath = _path.default.join(__dirname, '../../modules', `${formattedParams.module}/${formattedParams.tool}.js`);
-  if (!_fs.default.existsSync(toolPath)) {
-    console.error(`工具文件不存在: ${toolPath}`);
-    process.exit(1);
-  }
-  const toolModule = require(toolPath);
-  const toolFunction = toolModule.default;
-  if (!toolFunction) {
-    console.error(`工具函数不存在`);
-    process.exit(1);
+
+  // 上传命令走独立分支：只需 --file + autoPath，跳过 formatParams 常规流程
+  if (shortcut?.upload) {
+    const data = await executeUpload(shortcut, opts);
+    const toolKey = `${shortcut.module}/${shortcut.tool}`;
+    const isVerbose = !!opts.verbose;
+    console.log((0, _formatOutput.formatOutput)(data, isVerbose, !isVerbose, toolKey));
+    return;
   }
+  const formattedParams = (0, _formatParams.formatParams)(params);
+  const toolFunction = loadToolFunction(formattedParams.module, formattedParams.tool);
   const toolsParam = [];
   let pathAndQueryParams = null;
   if (formattedParams.path && Object.keys(formattedParams.path).length === 1 && !formattedParams.query) {
@@ -81,15 +106,10 @@ async function executeAction(moduleArg, toolArg, opts, parentCmd) {
   if (pathAndQueryParams) {
     toolsParam.push(pathAndQueryParams);
   }
-  let data;
-  if (shortcut?.upload) {
-    data = await (0, _upload.handleUpload)(shortcut, formattedParams.data?.file, toolFunction, pathAndQueryParams);
-  } else {
-    if (formattedParams.data) {
-      toolsParam.push(formattedParams.data);
-    }
-    data = await toolFunction(...toolsParam);
+  if (formattedParams.data) {
+    toolsParam.push(formattedParams.data);
   }
+  const data = await toolFunction(...toolsParam);
   const toolKey = `${formattedParams.module}/${formattedParams.tool}`;
   const isVerbose = !!formattedParams.verbose;
   const isSummary = shortcut ? !isVerbose : false;

package/skills/cnb-api/scripts/core/lib/register-modules.js

@@ -95,8 +95,12 @@ function registerModuleCommands(program) {
         await (0, _executeAction.executeAction)(moduleName, shortcut.shortName, opts, sub);
       });
 
-      // 复用真实 tool 的选项，跳过 path 参数
-      registerToolOptions(shortcutCmd, moduleName, shortcut.realTool, true);
+      // 上传命令只需要 --file，不复用真实 tool 的 body 选项（name/size/content_type 由上传流程自动获取）
+      if (!shortcut.upload) {
+        registerToolOptions(shortcutCmd, moduleName, shortcut.realTool, true);
+      } else {
+        shortcutCmd.requiredOption('--file <string>', '本地文件路径。必填。');
+      }
       registeredNames.add(shortcut.shortName);
     }
 

package/skills/cnb-api/scripts/core/utils/upload.js

@@ -170,7 +170,11 @@ async function handleUpload(shortcut, filePath, toolFunction, pathParams) {
     name: fileName,
     size: fileSize
   };
-  const uploadResponse = await toolFunction(pathParams, requestBody);
+
+  // Issue API 签名: fn({ repo, number }, body)
+  // PR API 签名:    fn(repo, body)
+  const apiFirstArg = isIssueUpload ? pathParams : pathParams.repo;
+  const uploadResponse = await toolFunction(apiFirstArg, requestBody);
 
   // 提取 upload_url
   const responseData = uploadResponse?.data;