fix: cli dont support --output-format

zxypro1 · zxypro1 · commit 36e17be30914 · 2025-04-09T15:33:54.000+08:00
Signed-off-by: zxypro1 &lt;1018995004@qq.com&gt;
diff --git a/src/command/cli/index.ts b/src/command/cli/index.ts
@@ -1,10 +1,10 @@
 import { Command } from 'commander';
 import chalk from 'chalk';
-import { emoji, getUid, isJson, writeOutput } from '@/utils';
+import { emoji, getUid, isJson, showOutput, writeOutput } from '@/utils';
 import * as utils from '@serverless-devs/utils';
 import loadComponent from '@serverless-devs/load-component';
 import Credential from '@serverless-devs/credential';
-import { each, filter, get, includes, isString } from 'lodash';
+import { each, filter, get, includes } from 'lodash';
 import logger from '@/logger';
 import Help from './help';
 import execDaemon from '@/exec-daemon';
@@ -102,14 +102,10 @@ const doAction = async () => {
     const reportData = { uid: await getUid(access), argv, command, component: componentName, userAgent: getUserAgent({ component: componentName }) };
     try {
       const res = await instance[command](inputs);
-      const showOutput = () => {
-        if (rest['output-file']) return;
-        logger.unsilent();
-        isString(res) ? (silent ? logger.write(res) : logger.write(chalk.green(res))) : logger.output(res);
-        if (silent) logger.silent();
-      };
-      showOutput();
-      writeOutput(res);
+      const argv = process.argv.slice(2);
+      const argvData = utils.parseArgv(argv);
+      const outputFile = get(argvData, 'output-file');
+      outputFile ? writeOutput(res) : showOutput(res);
       execDaemon('report.js', { ...reportData, type: EReportType.command });
       return;
     } catch (error) {
diff --git a/src/command/cli/v1.ts b/src/command/cli/v1.ts
@@ -1,8 +1,8 @@
 import { Command } from 'commander';
 import chalk from 'chalk';
 import * as core from '@serverless-devs/core';
-import { emoji, getUid, writeOutput } from '@/utils';
-import { includes, isEmpty, isPlainObject, isString } from 'lodash';
+import { emoji, getUid, showOutput, writeOutput } from '@/utils';
+import { get, includes, isEmpty, isPlainObject } from 'lodash';
 import logger from '@/logger';
 import path from 'path';
 import execDaemon from '@/exec-daemon';
@@ -18,7 +18,7 @@ const v1 = (program: Command) => {
   const doAction = async options => {
     const argv = process.argv.slice(2);
     const argvData = core.getGlobalArgs(argv);
-    const { _: rawData, access = 'default', help, silent } = argvData;
+    const { _: rawData, access = 'default', help } = argvData;
     // s cli
     if (rawData.length === 1 || (rawData.length === 1 && help)) {
       program.help();
@@ -69,15 +69,10 @@ const v1 = (program: Command) => {
         if (isEmpty(res)) {
           return logger.write(chalk.green(`End of method: ${_method}`));
         }
-        const showOutput = () => {
-          const argv = parseArgv(process.argv.slice(2));
-          if (argv['output-file']) return;
-          logger.unsilent();
-          isString(res) ? (silent ? logger.write(res) : logger.write(chalk.green(res))) : logger.output(res);
-          if (silent) logger.silent();
-        };
-        showOutput();
-        writeOutput(res);
+        const argv = process.argv.slice(2);
+        const argvData = parseArgv(argv);
+        const outputFile = get(argvData, 'output-file');
+        outputFile ? writeOutput(res) : showOutput(res);
         execDaemon('report.js', { ...reportData, type: EReportType.command });
       } catch (error) {
         handleError(
