refactor(codegen): normalize cli source args

Author: yyyyaaa

graphql/codegen/src/__tests__/config/cli-shared.test.ts

@@ -0,0 +1,39 @@
+import {
+  buildGenerateOptions,
+  seedArgvFromConfig,
+} from '../../cli/shared';
+
+describe('CLI shared utilities', () => {
+  it('preserves explicit false booleans from argv when merging with file config', () => {
+    const fileConfig = {
+      reactQuery: true,
+      orm: true,
+      dryRun: true,
+    };
+
+    const seeded = seedArgvFromConfig(
+      { reactQuery: false, orm: false },
+      fileConfig,
+    );
+
+    expect(seeded).toMatchObject({
+      reactQuery: false,
+      orm: false,
+    });
+  });
+
+  it('normalizes list options through buildGenerateOptions in non-interactive flows', () => {
+    const options = buildGenerateOptions(
+      {
+        schemas: 'public, app',
+        apiNames: 'core, admin',
+      },
+      {},
+    );
+
+    expect(options.db).toEqual({
+      schemas: ['public', 'app'],
+      apiNames: ['core', 'admin'],
+    });
+  });
+});

graphql/codegen/src/cli/index.ts

@@ -15,6 +15,8 @@ import {
   buildGenerateOptions,
   camelizeArgv,
   codegenQuestions,
+  hasResolvedCodegenSource,
+  normalizeCodegenListOptions,
   printResult,
   seedArgvFromConfig,
 } from './shared';
@@ -105,7 +107,9 @@ export const commands = async (
       }
 
       const cliOptions = buildDbConfig(
-        camelizeArgv(argv as Record<string, any>),
+        normalizeCodegenListOptions(
+          camelizeArgv(argv as Record<string, any>),
+        ),
       );
       let hasError = false;
       for (const name of names) {
@@ -127,7 +131,9 @@ export const commands = async (
   }
 
   const seeded = seedArgvFromConfig(argv, fileConfig);
-  const answers = await prompter.prompt(seeded, codegenQuestions);
+  const answers = hasResolvedCodegenSource(seeded)
+    ? seeded
+    : await prompter.prompt(seeded, codegenQuestions);
   const options = buildGenerateOptions(answers, fileConfig);
   const result = await generate(options);
   printResult(result);
@@ -147,15 +153,6 @@ export const options: Partial<CLIOptions> = {
       a: 'authorization',
       v: 'verbose',
     },
-    boolean: [
-      'help',
-      'version',
-      'verbose',
-      'dry-run',
-      'react-query',
-      'orm',
-      'keep-db',
-    ],
     string: [
       'config',
       'endpoint',

graphql/codegen/src/cli/shared.ts

@@ -21,6 +21,25 @@ export const splitCommas = (
     .filter(Boolean);
 };
 
+function normalizeListOption(
+  input: unknown,
+): string[] | undefined {
+  if (Array.isArray(input)) {
+    return input
+      .flatMap((item) =>
+        typeof item === 'string' ? (splitCommas(item) ?? []) : [String(item)],
+      )
+      .map((s) => s.trim())
+      .filter(Boolean);
+  }
+
+  if (typeof input === 'string') {
+    return splitCommas(input);
+  }
+
+  return undefined;
+}
+
 export interface CodegenAnswers {
   endpoint?: string;
   schemaFile?: string;
@@ -188,6 +207,41 @@ export function buildDbConfig(
   return rest;
 }
 
+/**
+ * Normalizes top-level list-like CLI options to string arrays.
+ * This keeps non-interactive paths equivalent to prompt sanitize behavior.
+ */
+export function normalizeCodegenListOptions(
+  options: Record<string, unknown>,
+): Record<string, unknown> {
+  return {
+    ...options,
+    schemas: normalizeListOption(options.schemas),
+    apiNames: normalizeListOption(options.apiNames),
+  };
+}
+
+/**
+ * Returns true when source options are already available, so prompting can be skipped.
+ */
+export function hasResolvedCodegenSource(
+  options: Record<string, unknown>,
+): boolean {
+  const normalized = normalizeCodegenListOptions(camelizeArgv(options));
+  const db = normalized.db as Record<string, unknown> | undefined;
+  const dbSchemas = normalizeListOption(db?.schemas);
+  const dbApiNames = normalizeListOption(db?.apiNames);
+
+  return Boolean(
+    normalized.endpoint ||
+      normalized.schemaFile ||
+      (normalized.schemas as string[] | undefined)?.length ||
+      (normalized.apiNames as string[] | undefined)?.length ||
+      dbSchemas?.length ||
+      dbApiNames?.length,
+  );
+}
+
 export function seedArgvFromConfig(
   argv: Record<string, unknown>,
   fileConfig: GraphQLSDKConfigTarget,
@@ -203,6 +257,7 @@ export function buildGenerateOptions(
   fileConfig: GraphQLSDKConfigTarget = {},
 ): GraphQLSDKConfigTarget {
   const camelized = camelizeArgv(answers);
-  const withDb = buildDbConfig(camelized);
+  const normalized = normalizeCodegenListOptions(camelized);
+  const withDb = buildDbConfig(normalized);
   return { ...fileConfig, ...withDb } as GraphQLSDKConfigTarget;
 }

graphql/codegen/src/index.ts

@@ -37,7 +37,9 @@ export {
   codegenQuestions,
   filterDefined,
   flattenDbFields,
+  hasResolvedCodegenSource,
   hyphenateKeys,
+  normalizeCodegenListOptions,
   printResult,
   seedArgvFromConfig,
   splitCommas,

packages/cli/__tests__/codegen.test.ts

@@ -39,10 +39,27 @@ jest.mock('@constructive-io/graphql-codegen', () => {
     }),
     camelizeArgv: jest.fn((argv: Record<string, any>) => argv),
     seedArgvFromConfig: jest.fn((argv: Record<string, unknown>, _fileConfig: any) => argv),
+    hasResolvedCodegenSource: jest.fn((argv: Record<string, unknown>) => {
+      const db = argv.db as Record<string, unknown> | undefined;
+      return Boolean(
+        argv.endpoint ||
+          argv['schema-file'] ||
+          argv.schemas ||
+          argv['api-names'] ||
+          db?.schemas ||
+          db?.apiNames
+      );
+    }),
     buildGenerateOptions: jest.fn((answers: Record<string, unknown>, _fileConfig: any) => {
       const { schemas, apiNames, ...rest } = answers;
+      const normalizedSchemas = Array.isArray(schemas)
+        ? schemas
+        : splitCommasMock(schemas as string | undefined);
+      const normalizedApiNames = Array.isArray(apiNames)
+        ? apiNames
+        : splitCommasMock(apiNames as string | undefined);
       if (schemas || apiNames) {
-        return { ...rest, db: { schemas, apiNames } };
+        return { ...rest, db: { schemas: normalizedSchemas, apiNames: normalizedApiNames } };
       }
       return rest;
     }),
@@ -101,6 +118,7 @@ describe('codegen command', () => {
 
     await codegenCommand(argv, mockPrompter as any, {} as any)
 
+    expect(mockPrompter.prompt).not.toHaveBeenCalled()
     expect(mockGenerate).toHaveBeenCalled()
     const call = mockGenerate.mock.calls[0][0]
     expect(call).toMatchObject({
@@ -125,6 +143,7 @@ describe('codegen command', () => {
 
     await codegenCommand(argv, mockPrompter as any, {} as any)
 
+    expect(mockPrompter.prompt).not.toHaveBeenCalled()
     expect(mockGenerate).toHaveBeenCalled()
     const call = mockGenerate.mock.calls[0][0]
     expect(call.db).toEqual({ schemas: ['public', 'app'], apiNames: undefined })

packages/cli/src/commands/codegen.ts

@@ -7,6 +7,7 @@ import {
   printResult,
   buildGenerateOptions,
   seedArgvFromConfig,
+  hasResolvedCodegenSource,
   type GraphQLSDKConfigTarget,
 } from '@constructive-io/graphql-codegen';
 
@@ -63,7 +64,9 @@ export default async (
   }
 
   const seeded = seedArgvFromConfig(argv as Record<string, unknown>, fileConfig);
-  const answers = await prompter.prompt(seeded, codegenQuestions);
+  const answers = hasResolvedCodegenSource(seeded)
+    ? seeded
+    : await prompter.prompt(seeded, codegenQuestions);
   const options = buildGenerateOptions(answers, fileConfig);
   const result = await generate(options);
   printResult(result);