refactor(agent-cli): share output field omission helper

Author: yifancong

packages/agent-cli/src/commands/handlers/assets.ts

@@ -4,7 +4,7 @@ import {
   getChunks,
   getAssets as getAssetsFromData,
 } from '../datasource';
-import { requireArg } from '../utils';
+import { omitModulesFields, requireArg } from '../utils';
 
 interface Asset {
   path: string;
@@ -230,21 +230,6 @@ const getAssetsDiffResult = (baseline: ChunkGraph, current: ChunkGraph) => ({
   },
 });
 
-const omitModulesFields = <T>(value: T): T => {
-  if (!value || typeof value !== 'object') {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map((item) => omitModulesFields(item)) as T;
-  }
-
-  return Object.fromEntries(
-    Object.entries(value)
-      .filter(([key]) => key !== 'modules')
-      .map(([key, item]) => [key, omitModulesFields(item)]),
-  ) as T;
-};
-
 export async function listAssets(): Promise<{
   ok: boolean;
   data: unknown;

packages/agent-cli/src/commands/handlers/build.ts

@@ -5,7 +5,7 @@ import {
   getDataFilePath,
   getEntrypoints as getEntrypointsFromData,
 } from '../datasource';
-import { parsePositiveInt } from '../utils';
+import { omitModulesFields, parsePositiveInt } from '../utils';
 import { getMediaAssets } from './assets';
 import { getLargeChunksData } from './chunks';
 import { detectDuplicatePackages, detectSimilarPackages } from './packages';
@@ -25,21 +25,6 @@ function withoutDescription<T>(result: { ok: boolean; data: T }): {
   };
 }
 
-function omitModulesFields<T>(value: T): T {
-  if (!value || typeof value !== 'object') {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map((item) => omitModulesFields(item)) as T;
-  }
-
-  return Object.fromEntries(
-    Object.entries(value)
-      .filter(([key]) => key !== 'modules')
-      .map(([key, item]) => [key, omitModulesFields(item)]),
-  ) as T;
-}
-
 export async function getSummary(): Promise<{
   ok: boolean;
   data: unknown;

packages/agent-cli/src/commands/handlers/chunks.ts

@@ -1,25 +1,15 @@
 import { getChunks, getChunkById as getChunkByIdFromData } from '../datasource';
-import { getMedianChunkSize, parseNumber, parsePositiveInt } from '../utils';
+import {
+  getMedianChunkSize,
+  omitModulesFields,
+  parseNumber,
+  parsePositiveInt,
+} from '../utils';
 
 interface Chunk {
   size: number;
 }
 
-const omitModulesFields = <T>(value: T): T => {
-  if (!value || typeof value !== 'object') {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map((item) => omitModulesFields(item)) as T;
-  }
-
-  return Object.fromEntries(
-    Object.entries(value)
-      .filter(([key]) => key !== 'modules')
-      .map(([key, item]) => [key, omitModulesFields(item)]),
-  ) as T;
-};
-
 export function getLargeChunksData(chunks: Chunk[]): {
   median: number;
   operator: number;

packages/agent-cli/src/commands/utils.ts

@@ -126,6 +126,21 @@ export function parseModulesInput(
   return parseCommaList(value);
 }
 
+export function omitModulesFields<T>(value: T): T {
+  if (!value || typeof value !== 'object') {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => omitModulesFields(item)) as T;
+  }
+
+  return Object.fromEntries(
+    Object.entries(value)
+      .filter(([key]) => key !== 'modules')
+      .map(([key, item]) => [key, omitModulesFields(item)]),
+  ) as T;
+}
+
 export function paginateItems<T>(
   items: T[],
   pageNumber: number,

packages/agent-cli/tests/cli.test.ts

@@ -4,6 +4,9 @@ import os from 'node:os';
 import path from 'node:path';
 
 import { runCli } from '../src/cli';
+import packageJson from '../package.json';
+
+const expectedVersionOutput = `${packageJson.version}\n`;
 
 describe('agent cli', () => {
   it('lists the available subcommands for an external main agent', async () => {
@@ -56,7 +59,7 @@ describe('agent cli', () => {
 
     expect(exitCode).toBe(0);
     expect(stderr.join('')).toBe('');
-    expect(stdout.join('')).toBe('0.1.0-beta.0\n');
+    expect(stdout.join('')).toBe(expectedVersionOutput);
   });
 
   it('prints the package version with short option', async () => {
@@ -70,7 +73,7 @@ describe('agent cli', () => {
 
     expect(exitCode).toBe(0);
     expect(stderr.join('')).toBe('');
-    expect(stdout.join('')).toBe('0.1.0-beta.0\n');
+    expect(stdout.join('')).toBe(expectedVersionOutput);
   });
 
   it('invokes a named tool through the external agent query path', async () => {