@acomo/cli 1.0.17 → 1.0.18

package/dist/index.js

@@ -14037,7 +14037,7 @@ var EXIT_CODES = {
   VALIDATION: 3,
   NOT_FOUND: 4
 };
-async function resolveParams(positional) {
+async function resolveBody(positional) {
   if (positional) {
     try {
       return JSON.parse(positional);
@@ -14047,6 +14047,12 @@ async function resolveParams(positional) {
   }
   return void 0;
 }
+function buildClientParams(operationId, namedParams, body) {
+  const paramInfo = getOperationRequestSchema(operationId);
+  if (!paramInfo?.requestBody) return namedParams;
+  const { dtoName } = paramInfo.requestBody;
+  return { ...namedParams, [dtoName]: body ?? {} };
+}
 function placeholderForType(type) {
   if (type === "string") return "";
   if (type === "number" || type === "integer") return 0;
@@ -14056,13 +14062,6 @@ function placeholderForType(type) {
     return {};
   return "";
 }
-function buildExampleParams(params) {
-  const out = {};
-  for (const p of params) {
-    if (p.required) out[p.name] = placeholderForType(p.type);
-  }
-  return out;
-}
 function buildExampleBody(properties) {
   const out = {};
   for (const p of properties) {
@@ -14166,7 +14165,6 @@ function buildApiCommandHelpDescriptor(operationId) {
   const pathParams = paramInfo.params.filter((p) => p.in === "path").map(toParamEntry);
   const queryParams = paramInfo.params.filter((p) => p.in === "query").map(toParamEntry);
   const requestBody = paramInfo.requestBody ? {
-    dtoName: paramInfo.requestBody.dtoName,
     properties: paramInfo.requestBody.properties.map((p) => {
       const entry = {
         name: p.name,
@@ -14178,29 +14176,38 @@ function buildApiCommandHelpDescriptor(operationId) {
       return entry;
     })
   } : null;
-  const minimalArgs = {
-    ...buildExampleParams(paramInfo.params)
-  };
-  if (paramInfo.requestBody) {
-    const bodyExample = buildExampleBody(paramInfo.requestBody.properties);
-    for (const [k, v] of Object.entries(bodyExample)) minimalArgs[k] = v;
-  }
-  const exampleCommand = `acomo ${operationId} '${JSON.stringify(minimalArgs)}'`;
-  const positionals = [
+  const paramOptions = paramInfo.params.map((p) => ({
+    name: p.name,
+    type: p.type === "number" || p.type === "integer" ? "number" : p.type === "boolean" ? "boolean" : "string",
+    description: normalizeDescription(p.description || ""),
+    required: p.required
+  }));
+  const minimalArgs = paramInfo.requestBody ? buildExampleBody(paramInfo.requestBody.properties) : null;
+  const optionsPart = paramInfo.params.filter((p) => p.required).map(
+    (p) => `--${p.name} ${p.example !== void 0 ? String(p.example) : `<${p.type}>`}`
+  ).join(" ");
+  const bodyPart = minimalArgs && Object.keys(minimalArgs).length > 0 ? ` '${JSON.stringify(minimalArgs)}'` : "";
+  const exampleCommand = `acomo ${operationId}${optionsPart ? " " + optionsPart : ""}${bodyPart}`;
+  const hasBody = !!paramInfo.requestBody;
+  const hasParams = paramInfo.params.length > 0;
+  const usageParts = [`acomo ${operationId}`];
+  if (hasParams) usageParts.push("[--option value...]");
+  if (hasBody) usageParts.push("[body]");
+  const positionals = hasBody ? [
     {
-      name: "params",
+      name: "body",
       type: "object",
       required: false,
-      description: "JSON \u30D1\u30E9\u30E1\u30FC\u30BF"
+      description: "\u30EA\u30AF\u30A8\u30B9\u30C8\u30DC\u30C7\u30A3 JSON"
     }
-  ];
+  ] : [];
   return buildCommandHelp({
     command: operationId,
     kind: "api-command",
     summary,
-    usage: `acomo ${operationId} [params]`,
+    usage: usageParts.join(" "),
     positionals,
-    options: GLOBAL_OPTIONS2,
+    options: [...paramOptions, ...GLOBAL_OPTIONS2],
     inputSchema: {
       pathParams,
       queryParams,
@@ -14328,7 +14335,29 @@ async function main() {
   const pkg = JSON.parse(
     readFileSync4(resolve5(scriptDir, "../package.json"), "utf-8")
   );
-  const argv = yargs_default(hideBin(process.argv)).scriptName("acomo").usage("Usage: $0 <command> [options]").help().alias("h", "help").version(pkg.version).alias("v", "version");
+  const argv = yargs_default(hideBin(process.argv)).scriptName("acomo").usage("Usage: $0 <command> [options]").help().alias("h", "help").version(pkg.version).alias("v", "version").fail((msg, _err, yargs) => {
+    if (msg === "\u30B3\u30DE\u30F3\u30C9\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002") {
+      yargs.showHelp();
+      process.exit(0);
+    }
+    const jsonMode = !process.stdout.isTTY;
+    if (jsonMode) {
+      console.error(
+        JSON.stringify({
+          error: true,
+          code: "VALIDATION_ERROR",
+          message: msg,
+          suggestion: "\u5FC5\u9808\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002`acomo <command> --help` \u3067\u30D1\u30E9\u30E1\u30FC\u30BF\u60C5\u5831\u3092\u78BA\u8A8D\u3067\u304D\u307E\u3059\u3002"
+        })
+      );
+    } else {
+      console.error(`\u5FC5\u9808\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059: ${msg}`);
+      console.error(
+        "`acomo <command> --help` \u3067\u30D1\u30E9\u30E1\u30FC\u30BF\u60C5\u5831\u3092\u78BA\u8A8D\u3067\u304D\u307E\u3059\u3002"
+      );
+    }
+    process.exit(EXIT_CODES.VALIDATION);
+  });
   argv.command(
     command2(),
     describe(),
@@ -14360,20 +14389,45 @@ async function main() {
       const registry = buildOperationRegistry(configuration);
       for (const [operationId] of registry) {
         const paramInfo = getOperationRequestSchema(operationId);
+        const hasBody = !!paramInfo?.requestBody;
         argv.command(
-          `${operationId} [params]`,
+          hasBody ? `${operationId} [body]` : operationId,
           operationDescriptions[operationId] ?? operationId,
           (y) => {
-            y.positional("params", {
-              type: "string",
-              description: "JSON \u30D1\u30E9\u30E1\u30FC\u30BF"
-            });
+            if (paramInfo) {
+              for (const p of paramInfo.params) {
+                const yargsType = p.type === "number" || p.type === "integer" ? "number" : p.type === "boolean" ? "boolean" : "string";
+                y.option(p.name, {
+                  type: yargsType,
+                  description: p.description,
+                  demandOption: p.required
+                });
+              }
+            }
+            if (hasBody) {
+              y.positional("body", {
+                type: "string",
+                description: "\u30EA\u30AF\u30A8\u30B9\u30C8\u30DC\u30C7\u30A3 JSON"
+              });
+            }
             return y;
           },
           async (cmdArgv) => {
             try {
-              const params = await resolveParams(
-                cmdArgv.params
+              const body = await resolveBody(
+                cmdArgv.body
+              );
+              const namedParams = {};
+              if (paramInfo) {
+                for (const p of paramInfo.params) {
+                  const val = cmdArgv[p.name];
+                  if (val !== void 0) namedParams[p.name] = val;
+                }
+              }
+              const clientParams = buildClientParams(
+                operationId,
+                namedParams,
+                body
               );
               const entry = registry.get(operationId);
               const apiConfig = createConfiguration();
@@ -14381,7 +14435,7 @@ async function main() {
                 apiConfig
               );
               const rawResponse = await instance[entry.method + "Raw"](
-                params ?? {}
+                clientParams
               );
               if (!rawResponse.raw.ok) {
                 throw new ResponseError(