xapi-to 0.1.11 → 0.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xapi-to",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "Agent-friendly CLI for xapi - discover and call capabilities and APIs",
   "type": "module",
   "bin": {

package/src/client.ts

@@ -124,13 +124,14 @@ export async function actionCall(
   actionId: string,
   input: Record<string, unknown>,
   opts: ClientOptions,
+  httpMethod?: string,
 ) {
   return request<unknown>(
     `${baseUrl(opts)}/v1/actions/execute`,
     {
       method: 'POST',
       headers: headers(opts.apiKey),
-      body: JSON.stringify({ action_id: actionId, input }),
+      body: JSON.stringify({ action_id: actionId, ...(httpMethod ? { method: httpMethod } : {}), input }),
     },
     EXECUTE_TIMEOUT_MS,
   );

package/src/codegen.ts

@@ -13,6 +13,7 @@ export interface CodegenParams {
   actionId: string;
   input: Record<string, unknown>;
   actionHost: string;
+  method?: string;
 }
 
 interface ResolvedTarget {
@@ -109,8 +110,8 @@ function baseUrl(actionHost: string): string {
   return `${scheme(actionHost)}://${actionHost}/v1/actions/execute`;
 }
 
-function jsonBody(actionId: string, input: Record<string, unknown>): string {
-  return JSON.stringify({ action_id: actionId, input }, null, 2);
+function jsonBody(actionId: string, input: Record<string, unknown>, method?: string): string {
+  return JSON.stringify({ action_id: actionId, ...(method ? { method } : {}), input }, null, 2);
 }
 
 /** Re-indent a multi-line string so continuation lines are aligned */
@@ -127,7 +128,7 @@ function shellEscape(s: string): string {
 
 function genCurl(params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input);
+  const body = jsonBody(params.actionId, params.input, params.method);
   return [
     '# Set XAPI_KEY env var or replace with your key',
     `curl -X POST '${shellEscape(url)}' \\`,
@@ -139,7 +140,7 @@ function genCurl(params: CodegenParams): string {
 
 function genPython(lib: 'requests' | 'httpx', params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const payload = { action_id: params.actionId, input: params.input };
+  const payload = { action_id: params.actionId, ...(params.method ? { method: params.method } : {}), input: params.input };
   return [
     `# pip install ${lib}`,
     '# Set XAPI_KEY env var or replace with your key',
@@ -160,7 +161,7 @@ function genPython(lib: 'requests' | 'httpx', params: CodegenParams): string {
 
 function genJavaScriptFetch(params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input);
+  const body = jsonBody(params.actionId, params.input, params.method);
   return [
     '// Set XAPI_KEY env var or replace with your key',
     `const resp = await fetch("${url}", {`,
@@ -177,7 +178,7 @@ function genJavaScriptFetch(params: CodegenParams): string {
 
 function genJavaScriptAxios(params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input);
+  const body = jsonBody(params.actionId, params.input, params.method);
   return [
     '// npm install axios',
     '// Set XAPI_KEY env var or replace with your key',
@@ -199,7 +200,7 @@ function genJavaScriptAxios(params: CodegenParams): string {
 
 function genTypescriptFetch(params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input);
+  const body = jsonBody(params.actionId, params.input, params.method);
   return [
     '// Set XAPI_KEY env var or replace with your key',
     `const resp: Response = await fetch("${url}", {`,
@@ -217,7 +218,7 @@ function genTypescriptFetch(params: CodegenParams): string {
 
 function genGo(params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input);
+  const body = jsonBody(params.actionId, params.input, params.method);
   const escaped = body.replace(/`/g, '` + "`" + `');
   return [
     '// Set XAPI_KEY env var or replace with your key',

package/src/commands/action.ts

@@ -278,8 +278,8 @@ export async function actionGet(args: string[], flags: Record<string, string>) {
         );
       }
       const action = filtered[0] as any;
-      const input = buildDefaultInput(action.input ?? {});
-      const result = generateCode(flags.code, { actionId: id, input, actionHost: cfg.actionHost });
+      const { method: _schemaMethod, ...cleanCodeInput } = buildDefaultInput(action.input ?? {});
+      const result = generateCode(flags.code, { actionId: id, input: cleanCodeInput, actionHost: cfg.actionHost, method: action.method });
       outputCode(result, flags);
       return;
     }
@@ -303,20 +303,24 @@ export async function actionCall(args: string[], flags: Record<string, string>)
     } catch {
       err('--input must be valid JSON');
     }
+    if (typeof input !== 'object' || input === null || Array.isArray(input)) {
+      err('--input must be a JSON object');
+    }
   }
-  if (flags.method) {
-    input = { ...input, method: flags.method.toUpperCase() };
-  }
+  // method 作为独立参数传递，兼容 input 内的 method
+  const { method: inputMethod, ...cleanInput } = input;
+  const method = flags.method?.toUpperCase()
+    || (typeof inputMethod === 'string' ? inputMethod.toUpperCase() : undefined);
 
   if (flags.code) {
-    const result = generateCode(flags.code, { actionId: id, input, actionHost: cfg.actionHost });
+    const result = generateCode(flags.code, { actionId: id, input: cleanInput, actionHost: cfg.actionHost, method });
     outputCode(result, flags);
     return;
   }
 
   requireApiKey(cfg);
   try {
-    const res = await client.actionCall(id, input, cfg);
+    const res = await client.actionCall(id, cleanInput, cfg, method);
     output(res, flags.format as any);
   } catch (e: any) {
     err('call failed', e.message);

package/src/index.ts

@@ -88,6 +88,7 @@ COMMANDS
   get <id> [--method GET|POST|...]   Get action schema (filter by HTTP method)
     --code <target>                  Generate code snippet (curl, py, js, ts, go)
   call <id> --input '{"key":"val"}'  Execute an action
+    --method GET|POST|...            Override HTTP method
     --code <target>                  Generate code snippet instead of executing
     Variants: python.requests, python.httpx, javascript.fetch, javascript.axios