@cnbcool/cnb-api-generate 2.1.1 → 2.2.1

package/client/lib/execute-action.ts

@@ -1,11 +1,49 @@
 import fs from 'fs';
 import path from 'path';
 import { Command } from 'commander';
-import { showShort, resolveShortcut } from '../shortcuts';
+import { showShort, resolveShortcut, type ResolvedShortcut } from '../shortcuts';
 import { handleUpload } from '../utils/upload';
 import { formatParams } from './format-params';
 import { formatOutput } from './format-output';
 
+/**
+ * 加载 tool 模块并返回其 default 导出函数
+ */
+function loadToolFunction(moduleName: string, toolName: string): any {
+  const toolPath = path.join(
+    __dirname,
+    '../../modules',
+    `${moduleName}/${toolName}.js`,
+  );
+
+  if (!fs.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: ResolvedShortcut,
+  opts: Record<string, any>,
+): Promise<any> {
+  const toolFunction = loadToolFunction(shortcut.module, shortcut.tool);
+  return handleUpload(shortcut, opts.file, toolFunction, shortcut.autoPath as any);
+}
+
 export async function executeAction(
   moduleArg: string | undefined,
   toolArg: string | undefined,
@@ -59,26 +97,18 @@ export async function executeAction(
     parentCmd.help();
   }
 
-  const formattedParams = formatParams(params);
-
-  const toolPath = path.join(
-    __dirname,
-    '../../modules',
-    `${formattedParams.module}/${formattedParams.tool}.js`,
-  );
-
-  if (!fs.existsSync(toolPath)) {
-    console.error(`工具文件不存在: ${toolPath}`);
-    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(formatOutput(data, isVerbose, !isVerbose, toolKey));
+    return;
   }
 
-  const toolModule = require(toolPath);
-  const toolFunction = toolModule.default;
+  const formattedParams = formatParams(params);
 
-  if (!toolFunction) {
-    console.error(`工具函数不存在`);
-    process.exit(1);
-  }
+  const toolFunction = loadToolFunction(formattedParams.module, formattedParams.tool);
 
   const toolsParam: any[] = [];
   let pathAndQueryParams: Record<string, any> | string | null = null;
@@ -109,15 +139,10 @@ export async function executeAction(
     toolsParam.push(pathAndQueryParams);
   }
 
-  let data: any;
-  if (shortcut?.upload) {
-    data = await handleUpload(shortcut, formattedParams.data?.file, toolFunction, pathAndQueryParams as { repo: string; number?: string });
-  } 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;

package/client/lib/format-params.ts

@@ -24,10 +24,8 @@ export function getToolParamDefs(moduleName: string, toolName: string) {
 export function formatParams(
   params: Record<string, string | string[] | boolean | undefined>,
 ): Record<string, any> {
-  console.log(JSON.stringify(params))
   // 先将 CLI 带 '-' 的参数名还原为原始 '_'/'@' 参数名
   params = restoreOriginalKeys(params);
-  console.log(params)
   const formatted: Record<string, any> = {
     module: params.module,
     tool: params.tool,

package/client/lib/print-json.ts

@@ -1,3 +1,4 @@
+import { encode } from '@toon-format/toon'
 /**
  * 将数据转换为格式化的 JSON 字符串
  * @param data 要序列化的数据（可以是任意类型）缩进）
@@ -8,5 +9,13 @@ export function printJSON(
   data: Record<string, any> | Array<any>,
   verbose: boolean = false
 ): string {
-  return verbose ? JSON.stringify(data, null, 2) : JSON.stringify(data);
+  if (verbose) {
+    return JSON.stringify(data, null, 2);
+  } else {
+    try {
+      return encode(data);
+    } catch (e) {
+      return JSON.stringify(data);
+    }
+  }
 }

package/client/lib/register-modules.ts

@@ -131,8 +131,13 @@ export function registerModuleCommands(program: Command): void {
           await 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/client/utils/upload.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnbcool/cnb-api-generate",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "main": "./built/index.js",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -33,6 +33,7 @@
     "@babel/preset-env": "^7.29.0",
     "@babel/preset-typescript": "^7.28.5",
     "@babel/traverse": "^7.29.0",
+    "@toon-format/toon": "^2.1.0",
     "@types/cli-progress": "^3.11.6",
     "@types/lodash": "4.17.20",
     "babel-plugin-transform-define": "^2.1.4",