fix: json flag issue interactive mode (#86)

Shubham-Rasal · web-flow · commit 81a2be8e01b6 · 2026-03-17T17:21:10.000-03:00
diff --git a/src/commands/api-keys/create.ts b/src/commands/api-keys/create.ts
@@ -49,7 +49,7 @@ Permissions:
     let permission = opts.permission;
 
     if (!name) {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           { message: 'Missing --name flag.', code: 'missing_name' },
           { json: globalOpts.json },
diff --git a/src/commands/auth/login.ts b/src/commands/auth/login.ts
@@ -57,7 +57,7 @@ export const loginCommand = new Command('login')
     let apiKey = opts.key;
 
     if (!apiKey) {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           {
             message:
@@ -174,7 +174,7 @@ export const loginCommand = new Command('login')
       }
     }
 
-    if (!profileName && isInteractive()) {
+    if (!profileName && isInteractive() && !globalOpts.json) {
       const existingProfiles = listProfiles();
       if (existingProfiles.length > 0) {
         const options = [
diff --git a/src/commands/auth/remove.ts b/src/commands/auth/remove.ts
@@ -13,7 +13,7 @@ export async function removeAction(
   let profileName = name;
 
   if (!profileName) {
-    if (!isInteractive()) {
+    if (!isInteractive() || globalOpts.json) {
       outputError(
         {
           message:
@@ -81,7 +81,7 @@ export async function removeAction(
       { success: true, removed_profile: profileName },
       { json: true },
     );
-  } else if (isInteractive()) {
+  } else if (isInteractive() && !globalOpts.json) {
     console.log(`Profile '${profileName}' removed.`);
   }
 }
diff --git a/src/commands/auth/switch.ts b/src/commands/auth/switch.ts
@@ -17,7 +17,7 @@ export async function switchAction(
   let profileName = name;
 
   if (!profileName) {
-    if (!isInteractive()) {
+    if (!isInteractive() || globalOpts.json) {
       outputError(
         {
           message:
diff --git a/src/commands/broadcasts/create.ts b/src/commands/broadcasts/create.ts
@@ -78,7 +78,7 @@ Scheduling:
     let segmentId = opts.segmentId;
 
     if (!from) {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           { message: 'Missing --from flag.', code: 'missing_from' },
           { json: globalOpts.json },
@@ -96,7 +96,7 @@ Scheduling:
     }
 
     if (!subject) {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           { message: 'Missing --subject flag.', code: 'missing_subject' },
           { json: globalOpts.json },
@@ -114,7 +114,7 @@ Scheduling:
     }
 
     if (!segmentId) {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           { message: 'Missing --segment-id flag.', code: 'missing_segment' },
           { json: globalOpts.json },
@@ -139,7 +139,7 @@ Scheduling:
     }
 
     if (!html && !text) {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           {
             message: 'Missing body. Provide --html, --html-file, or --text.',
diff --git a/src/commands/contacts/add-segment.ts b/src/commands/contacts/add-segment.ts
@@ -35,7 +35,7 @@ Non-interactive: --segment-id is required.`,
     let segmentId = opts.segmentId;
 
     if (!segmentId) {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           { message: 'Missing --segment-id flag.', code: 'missing_segment_id' },
           { json: globalOpts.json },
diff --git a/src/commands/contacts/create.ts b/src/commands/contacts/create.ts
@@ -66,7 +66,7 @@ Unsubscribed: setting --unsubscribed is a team-wide opt-out from all broadcasts,
     let firstName = opts.firstName;
     let lastName = opts.lastName;
 
-    if (isInteractive() && !opts.firstName) {
+    if (isInteractive() && !globalOpts.json && !opts.firstName) {
       const result = await p.text({
         message: 'First name (optional)',
         placeholder: 'Jane',
@@ -79,7 +79,7 @@ Unsubscribed: setting --unsubscribed is a team-wide opt-out from all broadcasts,
       }
     }
 
-    if (isInteractive() && !opts.lastName) {
+    if (isInteractive() && !globalOpts.json && !opts.lastName) {
       const result = await p.text({
         message: 'Last name (optional)',
         placeholder: 'Smith',
diff --git a/src/commands/contacts/update-topics.ts b/src/commands/contacts/update-topics.ts
@@ -49,7 +49,7 @@ Topics not included in the array are left unchanged.`,
     let topicsJson = opts.topics;
 
     if (!topicsJson) {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           { message: 'Missing --topics flag.', code: 'missing_topics' },
           { json: globalOpts.json },
diff --git a/src/commands/emails/send.ts b/src/commands/emails/send.ts
@@ -141,7 +141,7 @@ export const sendCommand = new Command('send')
     // Only fetch verified domains in interactive mode — non-interactive
     // callers (CI, agents, scripts) must pass --from explicitly.
     let fromAddress = opts.from;
-    if (!fromAddress && isInteractive()) {
+    if (!fromAddress && isInteractive() && !globalOpts.json) {
       const domains = await fetchVerifiedDomains(resend);
       if (domains.length > 0) {
         fromAddress = await promptForFromAddress(domains);
diff --git a/src/commands/templates/create.ts b/src/commands/templates/create.ts
@@ -59,7 +59,7 @@ Non-interactive: --name and a body (--html or --html-file) are required.`,
     let name = opts.name;
 
     if (!name) {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           { message: 'Missing --name flag.', code: 'missing_name' },
           { json: globalOpts.json },
@@ -93,7 +93,7 @@ Non-interactive: --name and a body (--html or --html-file) are required.`,
     }
 
     if (!html) {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           {
             message: 'Missing body. Provide --html or --html-file.',
diff --git a/src/commands/webhooks/create.ts b/src/commands/webhooks/create.ts
@@ -88,7 +88,7 @@ Non-interactive: --endpoint and --events are required.`,
     } else if (opts.events?.length) {
       selectedEvents = opts.events as WebhookEvent[];
     } else {
-      if (!isInteractive()) {
+      if (!isInteractive() || globalOpts.json) {
         outputError(
           { message: 'Missing --events flag.', code: 'missing_events' },
           { json: globalOpts.json },
diff --git a/src/lib/prompts.ts b/src/lib/prompts.ts
@@ -26,7 +26,7 @@ export async function confirmDelete(
   confirmMessage: string,
   globalOpts: GlobalOpts,
 ): Promise<void> {
-  if (!isInteractive()) {
+  if (!isInteractive() || globalOpts.json) {
     outputError(
       {
         message: 'Use --yes to confirm deletion in non-interactive mode.',
@@ -112,7 +112,7 @@ export async function requireText(
     return value;
   }
 
-  if (!isInteractive()) {
+  if (!isInteractive() || globalOpts.json) {
     outputError(error, { json: globalOpts.json });
   }
 
@@ -143,7 +143,7 @@ export async function requireSelect<V extends string>(
     return value;
   }
 
-  if (!isInteractive()) {
+  if (!isInteractive() || globalOpts.json) {
     outputError(error, { json: globalOpts.json });
   }
 
@@ -172,7 +172,7 @@ export async function promptForMissing<
     return current as { [K in keyof T]: string };
   }
 
-  if (!isInteractive()) {
+  if (!isInteractive() || globalOpts.json) {
     const flags = missing.map((f) => `--${f.flag}`).join(', ');
     outputError(
       { message: `Missing required flags: ${flags}`, code: 'missing_flags' },
diff --git a/tests/commands/api-keys/create.test.ts b/tests/commands/api-keys/create.test.ts
@@ -34,6 +34,7 @@ describe('api-keys create command', () => {
   let errorSpy: MockInstance | undefined;
   let stderrSpy: MockInstance | undefined;
   let exitSpy: MockInstance | undefined;
+  let commandRef: { parent: unknown } | undefined;
 
   beforeEach(() => {
     process.env.RESEND_API_KEY = 're_test_key';
@@ -49,6 +50,10 @@ describe('api-keys create command', () => {
     errorSpy = undefined;
     stderrSpy = undefined;
     exitSpy = undefined;
+    if (commandRef) {
+      commandRef.parent = null;
+      commandRef = undefined;
+    }
   });
 
   test('creates API key with --name flag', async () => {
@@ -135,6 +140,39 @@ describe('api-keys create command', () => {
     expect(output).toContain('missing_name');
   });
 
+  test('errors with missing_name when --json is set even in TTY', async () => {
+    Object.defineProperty(process.stdin, 'isTTY', {
+      value: true,
+      writable: true,
+    });
+    Object.defineProperty(process.stdout, 'isTTY', {
+      value: true,
+      writable: true,
+    });
+    errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    exitSpy = mockExitThrow();
+
+    const { Command } = await import('@commander-js/extra-typings');
+    const { createApiKeyCommand } = await import(
+      '../../../src/commands/api-keys/create'
+    );
+    const program = new Command()
+      .option('--profile <name>')
+      .option('--team <name>')
+      .option('--json')
+      .option('--api-key <key>')
+      .option('-q, --quiet')
+      .addCommand(createApiKeyCommand);
+    commandRef = createApiKeyCommand as unknown as { parent: unknown };
+
+    await expectExit1(() =>
+      program.parseAsync(['create', '--json'], { from: 'user' }),
+    );
+
+    const output = errorSpy.mock.calls.map((c) => c[0]).join(' ');
+    expect(output).toContain('missing_name');
+  });
+
   test('does not call SDK when missing_name error is raised', async () => {
     setNonInteractive();
     errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
diff --git a/tests/commands/auth/login.test.ts b/tests/commands/auth/login.test.ts
@@ -129,6 +129,39 @@ describe('login command', () => {
     expect(output).toContain('missing_key');
   });
 
+  test('errors with missing_key when --json is set but --key is omitted even in TTY', async () => {
+    Object.defineProperty(process.stdin, 'isTTY', {
+      value: true,
+      writable: true,
+    });
+    Object.defineProperty(process.stdout, 'isTTY', {
+      value: true,
+      writable: true,
+    });
+    errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    exitSpy = mockExitThrow();
+
+    const { Command } = await import('@commander-js/extra-typings');
+    const { loginCommand } = await import('../../../src/commands/auth/login');
+    const program = new Command()
+      .option('--profile <name>')
+      .option('--team <name>')
+      .option('--json')
+      .option('--api-key <key>')
+      .option('-q, --quiet')
+      .addCommand(loginCommand);
+
+    await expectExit1(() =>
+      program.parseAsync(['login', '--json'], { from: 'user' }),
+    );
+
+    const raw = errorSpy?.mock.calls.map((c) => c[0]).join(' ');
+    expect(raw).toContain('missing_key');
+
+    // @ts-expect-error — reset parent to avoid polluting the shared singleton
+    loginCommand.parent = null;
+  });
+
   test('non-interactive login stores as default when profiles exist', async () => {
     // Pre-populate credentials with an existing profile
     const configDir = join(tmpDir, 'resend');
diff --git a/tests/commands/auth/remove.test.ts b/tests/commands/auth/remove.test.ts
@@ -95,6 +95,28 @@ describe('auth remove command', () => {
     expect(output.error.code).toBe('missing_name');
   });
 
+  test('errors with missing_name when --json is set even in TTY', async () => {
+    Object.defineProperty(process.stdin, 'isTTY', {
+      value: true,
+      writable: true,
+    });
+    Object.defineProperty(process.stdout, 'isTTY', {
+      value: true,
+      writable: true,
+    });
+    errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    exitSpy = mockExitThrow();
+    storeApiKey('re_default');
+
+    const program = await createProgram();
+    await expectExit1(() =>
+      program.parseAsync(['remove', '--json'], { from: 'user' }),
+    );
+
+    const output = JSON.parse(errorSpy?.mock.calls[0][0] as string);
+    expect(output.error.code).toBe('missing_name');
+  });
+
   test('errors when profile does not exist', async () => {
     spies = setupOutputSpies();
     errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
diff --git a/tests/commands/auth/switch.test.ts b/tests/commands/auth/switch.test.ts
@@ -88,6 +88,28 @@ describe('auth switch command', () => {
     expect(output.error.code).toBe('missing_name');
   });
 
+  test('errors with missing_name when --json is set even in TTY', async () => {
+    Object.defineProperty(process.stdin, 'isTTY', {
+      value: true,
+      writable: true,
+    });
+    Object.defineProperty(process.stdout, 'isTTY', {
+      value: true,
+      writable: true,
+    });
+    errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    exitSpy = mockExitThrow();
+    storeApiKey('re_default');
+
+    const program = await createProgram();
+    await expectExit1(() =>
+      program.parseAsync(['switch', '--json'], { from: 'user' }),
+    );
+
+    const output = JSON.parse(errorSpy?.mock.calls[0][0] as string);
+    expect(output.error.code).toBe('missing_name');
+  });
+
   test('errors when profile does not exist', async () => {
     spies = setupOutputSpies();
     errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
diff --git a/tests/commands/broadcasts/create.test.ts b/tests/commands/broadcasts/create.test.ts
diff --git a/tests/commands/contacts/add-segment.test.ts b/tests/commands/contacts/add-segment.test.ts
diff --git a/tests/commands/contacts/create.test.ts b/tests/commands/contacts/create.test.ts
diff --git a/tests/commands/contacts/update-topics.test.ts b/tests/commands/contacts/update-topics.test.ts
diff --git a/tests/commands/emails/send.test.ts b/tests/commands/emails/send.test.ts
diff --git a/tests/commands/templates/create.test.ts b/tests/commands/templates/create.test.ts
diff --git a/tests/commands/webhooks/create.test.ts b/tests/commands/webhooks/create.test.ts
diff --git a/tests/lib/prompts.test.ts b/tests/lib/prompts.test.ts

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export const loginCommand = new Command('login')`
`57`	`57`	`let apiKey = opts.key;`
`58`	`58`
`59`	`59`	`if (!apiKey) {`
`60`		`- if (!isInteractive()) {`
	`60`	`+ if (!isInteractive() \|\| globalOpts.json) {`
`61`	`61`	`outputError(`
`62`	`62`	`{`
`63`	`63`	`message:`
`@@ -174,7 +174,7 @@ export const loginCommand = new Command('login')`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`177`		`- if (!profileName && isInteractive()) {`
	`177`	`+ if (!profileName && isInteractive() && !globalOpts.json) {`
`178`	`178`	`const existingProfiles = listProfiles();`
`179`	`179`	`if (existingProfiles.length > 0) {`
`180`	`180`	`const options = [`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export async function removeAction(`
`13`	`13`	`let profileName = name;`
`14`	`14`
`15`	`15`	`if (!profileName) {`
`16`		`- if (!isInteractive()) {`
	`16`	`+ if (!isInteractive() \|\| globalOpts.json) {`
`17`	`17`	`outputError(`
`18`	`18`	`{`
`19`	`19`	`message:`
`@@ -81,7 +81,7 @@ export async function removeAction(`
`81`	`81`	`{ success: true, removed_profile: profileName },`
`82`	`82`	`{ json: true },`
`83`	`83`	`);`
`84`		`- } else if (isInteractive()) {`
	`84`	`+ } else if (isInteractive() && !globalOpts.json) {`
`85`	`85`	console.log(`Profile '${profileName}' removed.`);
`86`	`86`	`}`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export async function switchAction(`
`17`	`17`	`let profileName = name;`
`18`	`18`
`19`	`19`	`if (!profileName) {`
`20`		`- if (!isInteractive()) {`
	`20`	`+ if (!isInteractive() \|\| globalOpts.json) {`
`21`	`21`	`outputError(`
`22`	`22`	`{`
`23`	`23`	`message:`