From 10344bcfcc081738c63c0c8c8fd99dadf5f37158 Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Thu, 15 Aug 2024 15:11:41 -0600
Subject: [PATCH 01/12] feat: add api request graphql command, UTs, NUTs

---
 README.md                                 |  63 ++++++++---
 command-snapshot.json                     |   8 ++
 messages/graphql.md                       |  35 ++++++
 package.json                              |   1 +
 src/commands/api/request/graphql.ts       | 109 ++++++++++++++++++
 src/commands/api/request/rest.ts          |   2 +-
 test/commands/api/request/graphql.nut.ts  | 131 ++++++++++++++++++++++
 test/commands/api/request/graphql.test.ts | 104 +++++++++++++++++
 8 files changed, 437 insertions(+), 16 deletions(-)
 create mode 100644 messages/graphql.md
 create mode 100644 src/commands/api/request/graphql.ts
 create mode 100644 test/commands/api/request/graphql.nut.ts
 create mode 100644 test/commands/api/request/graphql.test.ts

diff --git a/README.md b/README.md
index 45d3817..c1f82a2 100644
--- a/README.md
+++ b/README.md
@@ -107,43 +107,76 @@ sf plugins
 
 <!-- commands -->
 
-- [`sf hello world`](#sf-hello-world)
+- [`sf api request graphql`](#sf-api-request-graphql)
+- [`sf api request rest ENDPOINT`](#sf-api-request-rest-endpoint)
 
-## `sf hello world`
+## `sf api request graphql`
 
-Say hello.
+Summary of a command.
 
 ```
 USAGE
-  $ sf hello world [--json] [--flags-dir <value>] [-n <value>]
+  $ sf api request graphql -o <value> --body file [--json] [--flags-dir <value>] [-S Example: report.xlsx | -i]
 
 FLAGS
-  -n, --name=<value>  [default: World] The name of the person you'd like to say hello to.
+  -S, --stream-to-file=Example: report.xlsx  Stream responses to a file.
+  -i, --include                              Include the HTTP response status and headers in the output.
+  -o, --target-org=<value>                   (required) Username or alias of the target org. Not required if the
+                                             `target-org` configuration variable is already set.
+      --body=file                            (required) File to use as the body for the request. Specify "-" to read
+                                             from standard input.
 
 GLOBAL FLAGS
   --flags-dir=<value>  Import flag values from a directory.
   --json               Format output as json.
 
 DESCRIPTION
-  Say hello.
+  Summary of a command.
 
-  Say hello either to the world or someone you know.
+  More information about a command. Don't repeat the summary.
 
 EXAMPLES
-  Say hello to the world:
+  $ sf api request graphql
+```
+
+_See code: [src/commands/api/request/graphql.ts](https://github.com/salesforcecli/plugin-api/blob/v1.0.0/src/commands/api/request/graphql.ts)_
+
+## `sf api request rest ENDPOINT`
+
+Make an authenticated HTTP request to Salesforce REST API and print the response.
+
+```
+USAGE
+  $ sf api request rest ENDPOINT -o username [--flags-dir <value>] [-i | -S Example: report.xlsx] [-X
+    GET|POST|PUT|PATCH|HEAD|DELETE|OPTIONS|TRACE] [-H key:value...] [--body file]
 
-    $ sf hello world
+ARGUMENTS
+  ENDPOINT  Salesforce API endpoint
 
-  Say hello to someone you know:
+FLAGS
+  -H, --header=key:value...                  HTTP header in "key:value" format.
+  -S, --stream-to-file=Example: report.xlsx  Stream responses to a file.
+  -X, --method=<option>                      [default: GET] HTTP method for the request.
+                                             <options: GET|POST|PUT|PATCH|HEAD|DELETE|OPTIONS|TRACE>
+  -i, --include                              Include the HTTP response status and headers in the output.
+  -o, --target-org=username                  (required) Username or alias of the target org. Not required if the
+                                             `target-org` configuration variable is already set.
+      --body=file                            File to use as the body for the request. Specify "-" to read from standard
+                                             input; specify "" for an empty body.
+
+GLOBAL FLAGS
+  --flags-dir=<value>  Import flag values from a directory.
+
+EXAMPLES
+  List information about limits in the org with alias "my-org":
 
-    $ sf hello world --name Astro
+    $ sf api request rest 'services/data/v56.0/limits' --target-org my-org
 
-FLAG DESCRIPTIONS
-  -n, --name=<value>  The name of the person you'd like to say hello to.
+  Get the response in XML format by specifying the "Accept" HTTP header:
 
-    This person can be anyone in the world!
+    $ sf api request rest 'services/data/v56.0/limits' --target-org my-org --header 'Accept: application/xml',
 ```
 
-_See code: [src/commands/hello/world.ts](https://github.com/salesforcecli/plugin-template-sf/blob/1.1.14/src/commands/hello/world.ts)_
+_See code: [src/commands/api/request/rest.ts](https://github.com/salesforcecli/plugin-api/blob/v1.0.0/src/commands/api/request/rest.ts)_
 
 <!-- commandsstop -->
diff --git a/command-snapshot.json b/command-snapshot.json
index 084f164..a8111e9 100644
--- a/command-snapshot.json
+++ b/command-snapshot.json
@@ -1,4 +1,12 @@
 [
+  {
+    "alias": [],
+    "command": "api:request:graphql",
+    "flagAliases": [],
+    "flagChars": ["S", "i", "o"],
+    "flags": ["body", "flags-dir", "include", "json", "stream-to-file", "target-org"],
+    "plugin": "@salesforce/plugin-api"
+  },
   {
     "alias": [],
     "command": "api:request:rest",
diff --git a/messages/graphql.md b/messages/graphql.md
new file mode 100644
index 0000000..6a386cf
--- /dev/null
+++ b/messages/graphql.md
@@ -0,0 +1,35 @@
+# summary
+
+Summary of a command.
+
+# description
+
+More information about a command. Don't repeat the summary.
+
+# flags.name.summary
+
+Description of a flag.
+
+# flags.name.description
+
+More information about a flag. Don't repeat the summary.
+
+# examples
+
+- <%= config.bin %> <%= command.id %>
+
+# flags.include.summary
+
+Include the HTTP response status and headers in the output.
+
+# flags.header.summary
+
+HTTP header in "key:value" format.
+
+# flags.stream-to-file.summary
+
+Stream responses to a file.
+
+# flags.body.summary
+
+File to use as the body for the request. Specify "-" to read from standard input.
diff --git a/package.json b/package.json
index 3e302ec..0cd7aeb 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "@salesforce/core": "^8.4.0",
     "@salesforce/kit": "^3.2.1",
     "@salesforce/sf-plugins-core": "^11.3.2",
+    "@salesforce/ts-types": "^2.0.12",
     "ansis": "^3.3.2",
     "got": "^13.0.0",
     "proxy-agent": "^6.4.0"
diff --git a/src/commands/api/request/graphql.ts b/src/commands/api/request/graphql.ts
new file mode 100644
index 0000000..6639088
--- /dev/null
+++ b/src/commands/api/request/graphql.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import fs, { createWriteStream } from 'node:fs';
+import { EOL } from 'node:os';
+import * as os from 'node:os';
+import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
+import { Messages, Org, SfError } from '@salesforce/core';
+import { ProxyAgent } from 'proxy-agent';
+import ansis from 'ansis';
+import got from 'got';
+import type { AnyJson } from '@salesforce/ts-types';
+
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/plugin-api', 'graphql');
+
+export default class Graphql extends SfCommand<void> {
+  public static readonly summary = messages.getMessage('summary');
+  public static readonly description = messages.getMessage('description');
+  public static readonly examples = messages.getMessages('examples');
+  public static readonly state = 'beta';
+
+  public static readonly flags = {
+    'target-org': Flags.requiredOrg(),
+    'stream-to-file': Flags.string({
+      summary: messages.getMessage('flags.stream-to-file.summary'),
+      helpValue: 'Example: report.xlsx',
+      char: 'S',
+      exclusive: ['include'],
+    }),
+    include: Flags.boolean({
+      char: 'i',
+      summary: messages.getMessage('flags.include.summary'),
+      default: false,
+      exclusive: ['stream-to-file'],
+    }),
+    body: Flags.string({
+      summary: messages.getMessage('flags.body.summary'),
+      helpValue: 'file',
+      required: true,
+    }),
+  };
+
+  public async run(): Promise<void> {
+    const { flags } = await this.parse(Graphql);
+
+    const org = flags['target-org'];
+    const streamFile = flags['stream-to-file'];
+
+    await org.refreshAuth();
+    const apiVersion = await org.retrieveMaxApiVersion();
+
+    const url = `${org.getField<string>(Org.Fields.INSTANCE_URL)}/services/data/v${apiVersion}/graphql`;
+
+    const options = {
+      agent: { https: new ProxyAgent() },
+      headers: {
+        'Content-type': 'application/json',
+        Authorization: `Bearer ${org.getConnection(apiVersion).getConnectionOptions().accessToken!}`,
+        ...{},
+      },
+      body: `{"query":"${fs.readFileSync(flags.body, 'utf8').replaceAll(os.EOL, '\\n')}", "variables": {}}`,
+      throwHttpErrors: false,
+      followRedirect: false,
+    };
+
+    if (streamFile) {
+      const responseStream = got.stream.post(url, options);
+      const fileStream = createWriteStream(streamFile);
+      responseStream.pipe(fileStream);
+
+      fileStream.on('finish', () => this.log(`File saved to ${streamFile}`));
+      fileStream.on('error', (error) => {
+        throw SfError.wrap(error);
+      });
+      responseStream.on('error', (error) => {
+        throw SfError.wrap(error);
+      });
+    } else {
+      const res = await got.post(url, options);
+
+      // Print HTTP response status and headers.
+      if (flags.include) {
+        let httpInfo = `HTTP/${res.httpVersion} ${res.statusCode} ${EOL}`;
+
+        for (const [header] of Object.entries(res.headers)) {
+          httpInfo += `${ansis.blue.bold(header)}: ${res.headers[header] as string}${EOL}`;
+        }
+        this.log(httpInfo);
+      }
+
+      try {
+        // Try to pretty-print JSON response.
+        this.styledJSON(JSON.parse(res.body) as AnyJson);
+      } catch (err) {
+        // If response body isn't JSON, just print it to stdout.
+        this.log(res.body);
+      }
+
+      if (res.statusCode >= 400) {
+        process.exitCode = 1;
+      }
+    }
+  }
+}
diff --git a/src/commands/api/request/rest.ts b/src/commands/api/request/rest.ts
index fa3f295..aba7b95 100644
--- a/src/commands/api/request/rest.ts
+++ b/src/commands/api/request/rest.ts
@@ -67,7 +67,7 @@ export class Rest extends SfCommand<void> {
     }),
   };
 
-  private static getHeaders(keyValPair: string[]): Headers {
+  public static getHeaders(keyValPair: string[]): Headers {
     const headers: { [key: string]: string } = {};
 
     for (const header of keyValPair) {
diff --git a/test/commands/api/request/graphql.nut.ts b/test/commands/api/request/graphql.nut.ts
new file mode 100644
index 0000000..d8beeaa
--- /dev/null
+++ b/test/commands/api/request/graphql.nut.ts
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import { join } from 'node:path';
+import fs from 'node:fs';
+import { config, expect } from 'chai';
+import { execCmd, TestSession } from '@salesforce/cli-plugins-testkit';
+
+config.truncateThreshold = 0;
+
+describe('api:request:graphql NUT', () => {
+  let testSession: TestSession;
+
+  before(async () => {
+    testSession = await TestSession.create({
+      scratchOrgs: [
+        {
+          config: 'config/project-scratch-def.json',
+          setDefault: true,
+        },
+      ],
+      project: { gitClone: 'https://github.com/trailheadapps/dreamhouse-lwc' },
+      devhubAuthStrategy: 'AUTO',
+    });
+    fs.writeFileSync(
+      join(testSession.project.dir, 'standard.txt'),
+      `query accounts {
+  uiapi {
+    query {
+      Account {
+        edges {
+          node {
+            Id
+            Name {
+              value
+            }
+          }
+        }
+      }
+    }
+  }
+}
+`
+    );
+
+    fs.writeFileSync(
+      join(testSession.project.dir, 'noResults.txt'),
+      `query Address {
+  uiapi {
+    query {
+      Address {
+        edges {
+          node {
+            Id
+          }
+        }
+      }
+    }
+  }
+}
+`
+    );
+  });
+
+  after(async () => {
+    await testSession?.clean();
+  });
+
+  describe('std out', () => {
+    it('get result in json format', () => {
+      const result = execCmd('api request graphql --body standard.txt').shellOutput.stdout;
+
+      // make sure we got a JSON object back
+      const parsed = JSON.parse(result) as Record<string, unknown>;
+      expect(Object.keys(parsed)).to.have.length;
+
+      // @ts-expect-error graphql response, just access what we need without typing it
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      expect(parsed.data!.uiapi.query.Account.edges.length).to.equal(1);
+      expect(parsed.errors).to.deep.equal([]);
+    });
+
+    it('get no results correctly', () => {
+      const result = execCmd('api request graphql --body noResults.txt').shellOutput.stdout;
+
+      // make sure we got a JSON object back
+      const parsed = JSON.parse(result) as Record<string, unknown>;
+      expect(Object.keys(parsed)).to.have.length;
+      // @ts-expect-error graphql response, just access what we need without typing it
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      expect(parsed.data!.uiapi.query.Address.edges.length).to.equal(0);
+      expect(parsed.errors).to.deep.equal([]);
+    });
+  });
+
+  describe('stream-to-file', () => {
+    it('get result in json format', () => {
+      execCmd('api request graphql --body standard.txt --stream-to-file out.txt').shellOutput.stdout;
+
+      // make sure we got a JSON object back
+      const parsed = JSON.parse(fs.readFileSync(join(testSession.project.dir, 'out.txt'), 'utf8')) as Record<
+        string,
+        unknown
+      >;
+      expect(Object.keys(parsed)).to.have.length;
+      // @ts-expect-error graphql response, just access what we need without typing it
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      expect(parsed.data!.uiapi.query.Account.edges.length).to.equal(1);
+      expect(parsed.errors).to.deep.equal([]);
+    });
+
+    it('get no results correctly', () => {
+      execCmd('api request graphql --body noResults.txt --stream-to-file empty.txt').shellOutput.stdout;
+
+      // make sure we got a JSON object back
+      const parsed = JSON.parse(fs.readFileSync(join(testSession.project.dir, 'empty.txt'), 'utf8')) as Record<
+        string,
+        unknown
+      >;
+      expect(Object.keys(parsed)).to.have.length;
+      // @ts-expect-error graphql response, just access what we need without typing it
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      expect(parsed.data!.uiapi.query.Address.edges.length).to.equal(0);
+      expect(parsed.errors).to.deep.equal([]);
+    });
+  });
+});
diff --git a/test/commands/api/request/graphql.test.ts b/test/commands/api/request/graphql.test.ts
new file mode 100644
index 0000000..1dbe317
--- /dev/null
+++ b/test/commands/api/request/graphql.test.ts
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+import fs from 'node:fs';
+import * as process from 'node:process';
+import path from 'node:path';
+import { expect } from 'chai';
+import stripAnsi from 'strip-ansi';
+import { MockTestOrgData, TestContext } from '@salesforce/core/testSetup';
+import { sleep } from '@salesforce/kit';
+import nock = require('nock');
+import Graphql from '../../../../src/commands/api/request/graphql.js';
+
+describe('graphql', () => {
+  const $$ = new TestContext();
+  const testOrg = new MockTestOrgData('1234', {
+    username: 'test@hub.com',
+  });
+
+  let stdoutSpy: sinon.SinonSpy;
+
+  const fileContent = `query accounts {
+  uiapi {
+    query {
+      Account {
+        edges {
+          node {
+            Id
+            Name {
+              value
+            }
+          }
+        }
+      }
+    }
+  }
+}
+`;
+  const serverResponse = {
+    data: {
+      uiapi: {
+        query: {
+          Account: {
+            edges: [
+              {
+                node: {
+                  Id: '0017g00001nEdPjAAK',
+                  Name: {
+                    value: 'Sample Account for Entitlements',
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
+    },
+    errors: [],
+  };
+
+  beforeEach(async () => {
+    await $$.stubAuths(testOrg);
+
+    $$.SANDBOX.stub(fs, 'readFileSync').returns(fileContent);
+    stdoutSpy = $$.SANDBOX.stub(process.stdout, 'write');
+  });
+
+  afterEach(() => {
+    $$.SANDBOX.restore();
+  });
+
+  it('should run and return graphql query', async () => {
+    nock(testOrg.instanceUrl).post('/services/data/v42.0/graphql').reply(200, serverResponse);
+
+    await Graphql.run(['--target-org', 'test@hub.com', '--body', 'query.txt']);
+
+    const output = stripAnsi(stdoutSpy.args.flat().join(''));
+
+    expect(JSON.parse(output)).to.deep.equal(serverResponse);
+  });
+
+  it('should redirect to file', async () => {
+    nock(testOrg.instanceUrl).post('/services/data/v42.0/graphql').reply(200, serverResponse);
+
+    await Graphql.run(['--target-org', 'test@hub.com', '--body', 'query.txt', '--stream-to-file', 'myOutput1.txt']);
+
+    // gives it a second to resolve promises and close streams before we start asserting
+    await sleep(1000);
+    const output = stripAnsi(stdoutSpy.args.flat().join(''));
+
+    expect(output).to.deep.equal('File saved to myOutput1.txt' + '\n');
+    expect(await fs.promises.readFile('myOutput1.txt', 'utf8')).to.deep.equal(
+      '{"data":{"uiapi":{"query":{"Account":{"edges":[{"node":{"Id":"0017g00001nEdPjAAK","Name":{"value":"Sample Account for Entitlements"}}}]}}}},"errors":[]}'
+    );
+
+    after(() => {
+      // more than a UT
+      fs.rmSync(path.join(process.cwd(), 'myOutput1.txt'));
+    });
+  });
+});

From 45c20e4084bc291fea4398baacfd23f377549b4c Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Fri, 16 Aug 2024 09:25:42 -0600
Subject: [PATCH 02/12] test: add logging

---
 README.md                                | 50 +-----------------------
 test/commands/api/request/graphql.nut.ts |  7 +++-
 2 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index c1f82a2..20ab04a 100644
--- a/README.md
+++ b/README.md
@@ -1,55 +1,7 @@
-**NOTE: This template for sf plugins is not yet official. Please consult with the Platform CLI team before using this template.**
-
-# plugin-template-sf
-
-[![NPM](https://img.shields.io/npm/v/@salesforce/plugin-template-sf.svg?label=@salesforce/plugin-template-sf)](https://www.npmjs.com/package/@salesforce/plugin-template-sf) [![Downloads/week](https://img.shields.io/npm/dw/@salesforce/plugin-template-sf.svg)](https://npmjs.org/package/@salesforce/plugin-template-sf) [![License](https://img.shields.io/badge/License-BSD%203--Clause-brightgreen.svg)](https://raw.githubusercontent.com/salesforcecli/plugin-template-sf/main/LICENSE.txt)
-
-## Using the template
-
-This repository provides a template for creating a plugin for the Salesforce CLI. To convert this template to a working plugin:
-
-1. Please get in touch with the Platform CLI team. We want to help you develop your plugin.
-2. Generate your plugin:
-
-   ```
-   sf plugins install dev
-   sf dev generate plugin
-
-   git init -b main
-   git add . && git commit -m "chore: initial commit"
-   ```
-
-3. Create your plugin's repo in the salesforcecli github org
-4. When you're ready, replace the contents of this README with the information you want.
-
-## Learn about `sf` plugins
-
-Salesforce CLI plugins are based on the [oclif plugin framework](https://oclif.io/docs/introduction). Read the [plugin developer guide](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_plugins.meta/sfdx_cli_plugins/cli_plugins_architecture_sf_cli.htm) to learn about Salesforce CLI plugin development.
-
-This repository contains a lot of additional scripts and tools to help with general Salesforce node development and enforce coding standards. You should familiarize yourself with some of the [node developer packages](#tooling) used by Salesforce. There is also a default circleci config using the [release management orb](https://github.com/forcedotcom/npm-release-management-orb) standards.
-
-Additionally, there are some additional tests that the Salesforce CLI will enforce if this plugin is ever bundled with the CLI. These test are included by default under the `posttest` script and it is required to keep these tests active in your plugin if you plan to have it bundled.
-
-### Tooling
-
-- [@salesforce/core](https://github.com/forcedotcom/sfdx-core)
-- [@salesforce/kit](https://github.com/forcedotcom/kit)
-- [@salesforce/sf-plugins-core](https://github.com/salesforcecli/sf-plugins-core)
-- [@salesforce/ts-types](https://github.com/forcedotcom/ts-types)
-- [@salesforce/ts-sinon](https://github.com/forcedotcom/ts-sinon)
-- [@salesforce/dev-config](https://github.com/forcedotcom/dev-config)
-- [@salesforce/dev-scripts](https://github.com/forcedotcom/dev-scripts)
-
-# Everything past here is only a suggestion as to what should be in your specific plugin's description
-
-This plugin is bundled with the [Salesforce CLI](https://developer.salesforce.com/tools/sfdxcli). For more information on the CLI, read the [getting started guide](https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_setup_intro.htm).
-
-We always recommend using the latest version of these commands bundled with the CLI, however, you can install a specific version or tag if needed.
-
 ## Install
 
 ```bash
-sf plugins install @salesforce/plugin-template-sf@x.y.z
+sf plugins install @salesforce/plugin-api
 ```
 
 ## Issues
diff --git a/test/commands/api/request/graphql.nut.ts b/test/commands/api/request/graphql.nut.ts
index d8beeaa..69af768 100644
--- a/test/commands/api/request/graphql.nut.ts
+++ b/test/commands/api/request/graphql.nut.ts
@@ -7,6 +7,7 @@
 
 import { join } from 'node:path';
 import fs from 'node:fs';
+import * as util from 'node:util';
 import { config, expect } from 'chai';
 import { execCmd, TestSession } from '@salesforce/cli-plugins-testkit';
 
@@ -73,6 +74,8 @@ describe('api:request:graphql NUT', () => {
   describe('std out', () => {
     it('get result in json format', () => {
       const result = execCmd('api request graphql --body standard.txt').shellOutput.stdout;
+      // eslint-disable-next-line no-console
+      console.log('res', util.inspect(result));
 
       // make sure we got a JSON object back
       const parsed = JSON.parse(result) as Record<string, unknown>;
@@ -86,7 +89,8 @@ describe('api:request:graphql NUT', () => {
 
     it('get no results correctly', () => {
       const result = execCmd('api request graphql --body noResults.txt').shellOutput.stdout;
-
+      // eslint-disable-next-line no-console
+      console.log('res', util.inspect(result));
       // make sure we got a JSON object back
       const parsed = JSON.parse(result) as Record<string, unknown>;
       expect(Object.keys(parsed)).to.have.length;
@@ -100,7 +104,6 @@ describe('api:request:graphql NUT', () => {
   describe('stream-to-file', () => {
     it('get result in json format', () => {
       execCmd('api request graphql --body standard.txt --stream-to-file out.txt').shellOutput.stdout;
-
       // make sure we got a JSON object back
       const parsed = JSON.parse(fs.readFileSync(join(testSession.project.dir, 'out.txt'), 'utf8')) as Record<
         string,

From e7060cfbd2e7b21c6786107cab81a18c517de5b5 Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Fri, 16 Aug 2024 10:10:54 -0600
Subject: [PATCH 03/12] refactor: move test files, local project

---
 .../api/request/{ => graphql}/graphql.nut.ts  | 52 ++++---------------
 .../api/request/{ => graphql}/graphql.test.ts |  6 +--
 .../api/request/{ => rest}/rest.nut.ts        |  0
 .../api/request/{ => rest}/rest.test.ts       |  2 +-
 .../config/project-scratch-def.json           | 13 +++++
 test/test-files/data-project/noResults.txt    | 13 +++++
 .../test-files/data-project/sfdx-project.json | 11 ++++
 test/test-files/data-project/standard.txt     | 16 ++++++
 8 files changed, 66 insertions(+), 47 deletions(-)
 rename test/commands/api/request/{ => graphql}/graphql.nut.ts (76%)
 rename test/commands/api/request/{ => graphql}/graphql.test.ts (94%)
 rename test/commands/api/request/{ => rest}/rest.nut.ts (100%)
 rename test/commands/api/request/{ => rest}/rest.test.ts (98%)
 create mode 100644 test/test-files/data-project/config/project-scratch-def.json
 create mode 100644 test/test-files/data-project/noResults.txt
 create mode 100644 test/test-files/data-project/sfdx-project.json
 create mode 100644 test/test-files/data-project/standard.txt

diff --git a/test/commands/api/request/graphql.nut.ts b/test/commands/api/request/graphql/graphql.nut.ts
similarity index 76%
rename from test/commands/api/request/graphql.nut.ts
rename to test/commands/api/request/graphql/graphql.nut.ts
index 69af768..972d7d8 100644
--- a/test/commands/api/request/graphql.nut.ts
+++ b/test/commands/api/request/graphql/graphql.nut.ts
@@ -24,47 +24,9 @@ describe('api:request:graphql NUT', () => {
           setDefault: true,
         },
       ],
-      project: { gitClone: 'https://github.com/trailheadapps/dreamhouse-lwc' },
+      project: { sourceDir: join('test', 'test-files', 'data-project') },
       devhubAuthStrategy: 'AUTO',
     });
-    fs.writeFileSync(
-      join(testSession.project.dir, 'standard.txt'),
-      `query accounts {
-  uiapi {
-    query {
-      Account {
-        edges {
-          node {
-            Id
-            Name {
-              value
-            }
-          }
-        }
-      }
-    }
-  }
-}
-`
-    );
-
-    fs.writeFileSync(
-      join(testSession.project.dir, 'noResults.txt'),
-      `query Address {
-  uiapi {
-    query {
-      Address {
-        edges {
-          node {
-            Id
-          }
-        }
-      }
-    }
-  }
-}
-`
-    );
   });
 
   after(async () => {
@@ -73,7 +35,8 @@ describe('api:request:graphql NUT', () => {
 
   describe('std out', () => {
     it('get result in json format', () => {
-      const result = execCmd('api request graphql --body standard.txt').shellOutput.stdout;
+      const result = execCmd(`api request graphql --body ${join(testSession.project.dir, 'standard.txt')}`).shellOutput
+        .stdout;
       // eslint-disable-next-line no-console
       console.log('res', util.inspect(result));
 
@@ -88,7 +51,8 @@ describe('api:request:graphql NUT', () => {
     });
 
     it('get no results correctly', () => {
-      const result = execCmd('api request graphql --body noResults.txt').shellOutput.stdout;
+      const result = execCmd(`api request graphql --body ${join(testSession.project.dir, 'noResults.txt')}`).shellOutput
+        .stdout;
       // eslint-disable-next-line no-console
       console.log('res', util.inspect(result));
       // make sure we got a JSON object back
@@ -103,7 +67,8 @@ describe('api:request:graphql NUT', () => {
 
   describe('stream-to-file', () => {
     it('get result in json format', () => {
-      execCmd('api request graphql --body standard.txt --stream-to-file out.txt').shellOutput.stdout;
+      execCmd(`api request graphql --body ${join(testSession.project.dir, 'standard.txt')} --stream-to-file out.txt`)
+        .shellOutput.stdout;
       // make sure we got a JSON object back
       const parsed = JSON.parse(fs.readFileSync(join(testSession.project.dir, 'out.txt'), 'utf8')) as Record<
         string,
@@ -117,7 +82,8 @@ describe('api:request:graphql NUT', () => {
     });
 
     it('get no results correctly', () => {
-      execCmd('api request graphql --body noResults.txt --stream-to-file empty.txt').shellOutput.stdout;
+      execCmd(`api request graphql --body ${join(testSession.project.dir, 'noResults.txt')} --stream-to-file empty.txt`)
+        .shellOutput.stdout;
 
       // make sure we got a JSON object back
       const parsed = JSON.parse(fs.readFileSync(join(testSession.project.dir, 'empty.txt'), 'utf8')) as Record<
diff --git a/test/commands/api/request/graphql.test.ts b/test/commands/api/request/graphql/graphql.test.ts
similarity index 94%
rename from test/commands/api/request/graphql.test.ts
rename to test/commands/api/request/graphql/graphql.test.ts
index 1dbe317..add319a 100644
--- a/test/commands/api/request/graphql.test.ts
+++ b/test/commands/api/request/graphql/graphql.test.ts
@@ -12,7 +12,7 @@ import stripAnsi from 'strip-ansi';
 import { MockTestOrgData, TestContext } from '@salesforce/core/testSetup';
 import { sleep } from '@salesforce/kit';
 import nock = require('nock');
-import Graphql from '../../../../src/commands/api/request/graphql.js';
+import Graphql from '../../../../../src/commands/api/request/graphql.js';
 
 describe('graphql', () => {
   const $$ = new TestContext();
@@ -75,7 +75,7 @@ describe('graphql', () => {
   it('should run and return graphql query', async () => {
     nock(testOrg.instanceUrl).post('/services/data/v42.0/graphql').reply(200, serverResponse);
 
-    await Graphql.run(['--target-org', 'test@hub.com', '--body', 'query.txt']);
+    await Graphql.run(['--target-org', 'test@hub.com', '--body', 'standard.txt']);
 
     const output = stripAnsi(stdoutSpy.args.flat().join(''));
 
@@ -85,7 +85,7 @@ describe('graphql', () => {
   it('should redirect to file', async () => {
     nock(testOrg.instanceUrl).post('/services/data/v42.0/graphql').reply(200, serverResponse);
 
-    await Graphql.run(['--target-org', 'test@hub.com', '--body', 'query.txt', '--stream-to-file', 'myOutput1.txt']);
+    await Graphql.run(['--target-org', 'test@hub.com', '--body', 'standard.txt', '--stream-to-file', 'myOutput1.txt']);
 
     // gives it a second to resolve promises and close streams before we start asserting
     await sleep(1000);
diff --git a/test/commands/api/request/rest.nut.ts b/test/commands/api/request/rest/rest.nut.ts
similarity index 100%
rename from test/commands/api/request/rest.nut.ts
rename to test/commands/api/request/rest/rest.nut.ts
diff --git a/test/commands/api/request/rest.test.ts b/test/commands/api/request/rest/rest.test.ts
similarity index 98%
rename from test/commands/api/request/rest.test.ts
rename to test/commands/api/request/rest/rest.test.ts
index edfd526..b238a6c 100644
--- a/test/commands/api/request/rest.test.ts
+++ b/test/commands/api/request/rest/rest.test.ts
@@ -13,7 +13,7 @@ import stripAnsi from 'strip-ansi';
 import { MockTestOrgData, TestContext } from '@salesforce/core/testSetup';
 import { sleep } from '@salesforce/kit';
 import nock = require('nock');
-import { Rest } from '../../../../src/commands/api/request/rest.js';
+import { Rest } from '../../../../../src/commands/api/request/rest.js';
 
 describe('rest', () => {
   const $$ = new TestContext();
diff --git a/test/test-files/data-project/config/project-scratch-def.json b/test/test-files/data-project/config/project-scratch-def.json
new file mode 100644
index 0000000..f6932c7
--- /dev/null
+++ b/test/test-files/data-project/config/project-scratch-def.json
@@ -0,0 +1,13 @@
+{
+  "orgName": "peter.hale company",
+  "edition": "Developer",
+  "features": ["EnableSetPasswordInApi", "ContactsToMultipleAccounts"],
+  "settings": {
+    "lightningExperienceSettings": {
+      "enableS1DesktopEnabled": true
+    },
+    "mobileSettings": {
+      "enableS1EncryptedStoragePref2": false
+    }
+  }
+}
diff --git a/test/test-files/data-project/noResults.txt b/test/test-files/data-project/noResults.txt
new file mode 100644
index 0000000..12205d6
--- /dev/null
+++ b/test/test-files/data-project/noResults.txt
@@ -0,0 +1,13 @@
+query Address {
+  uiapi {
+    query {
+      Address {
+        edges {
+          node {
+            Id
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/test/test-files/data-project/sfdx-project.json b/test/test-files/data-project/sfdx-project.json
new file mode 100644
index 0000000..1ac36e6
--- /dev/null
+++ b/test/test-files/data-project/sfdx-project.json
@@ -0,0 +1,11 @@
+{
+  "packageDirectories": [
+    {
+      "path": "force-app",
+      "default": true
+    }
+  ],
+  "namespace": "",
+  "sfdcLoginUrl": "https://login.salesforce.com",
+  "sourceApiVersion": "51.0"
+}
diff --git a/test/test-files/data-project/standard.txt b/test/test-files/data-project/standard.txt
new file mode 100644
index 0000000..e0f4767
--- /dev/null
+++ b/test/test-files/data-project/standard.txt
@@ -0,0 +1,16 @@
+query accounts {
+  uiapi {
+    query {
+      Account {
+        edges {
+          node {
+            Id
+            Name {
+              value
+            }
+          }
+        }
+      }
+    }
+  }
+}

From 29af6404db42b51f41f9348d302531cbbe621d74 Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Fri, 16 Aug 2024 10:19:24 -0600
Subject: [PATCH 04/12] chore: populate force-app

---
 .../force-app/main/default/classes/MyClass.cls           | 9 +++++++++
 .../force-app/main/default/classes/MyClass.cls-meta.xml  | 5 +++++
 2 files changed, 14 insertions(+)
 create mode 100644 test/test-files/data-project/force-app/main/default/classes/MyClass.cls
 create mode 100644 test/test-files/data-project/force-app/main/default/classes/MyClass.cls-meta.xml

diff --git a/test/test-files/data-project/force-app/main/default/classes/MyClass.cls b/test/test-files/data-project/force-app/main/default/classes/MyClass.cls
new file mode 100644
index 0000000..593739d
--- /dev/null
+++ b/test/test-files/data-project/force-app/main/default/classes/MyClass.cls
@@ -0,0 +1,9 @@
+public inherited sharing class MyClass {
+    public MyClass() {
+
+    }
+
+    public String toDO() {
+        return 'todo';
+    }
+}
diff --git a/test/test-files/data-project/force-app/main/default/classes/MyClass.cls-meta.xml b/test/test-files/data-project/force-app/main/default/classes/MyClass.cls-meta.xml
new file mode 100644
index 0000000..541584f
--- /dev/null
+++ b/test/test-files/data-project/force-app/main/default/classes/MyClass.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>50.0</apiVersion>
+    <status>Active</status>
+</ApexClass>

From a02aaa3d6d02aab023ad0f191cfd433b44a7033b Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Fri, 16 Aug 2024 10:29:33 -0600
Subject: [PATCH 05/12] chore: remove logging

---
 test/commands/api/request/graphql/graphql.nut.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/commands/api/request/graphql/graphql.nut.ts b/test/commands/api/request/graphql/graphql.nut.ts
index 972d7d8..d981e0d 100644
--- a/test/commands/api/request/graphql/graphql.nut.ts
+++ b/test/commands/api/request/graphql/graphql.nut.ts
@@ -7,7 +7,6 @@
 
 import { join } from 'node:path';
 import fs from 'node:fs';
-import * as util from 'node:util';
 import { config, expect } from 'chai';
 import { execCmd, TestSession } from '@salesforce/cli-plugins-testkit';
 
@@ -37,8 +36,6 @@ describe('api:request:graphql NUT', () => {
     it('get result in json format', () => {
       const result = execCmd(`api request graphql --body ${join(testSession.project.dir, 'standard.txt')}`).shellOutput
         .stdout;
-      // eslint-disable-next-line no-console
-      console.log('res', util.inspect(result));
 
       // make sure we got a JSON object back
       const parsed = JSON.parse(result) as Record<string, unknown>;
@@ -53,8 +50,6 @@ describe('api:request:graphql NUT', () => {
     it('get no results correctly', () => {
       const result = execCmd(`api request graphql --body ${join(testSession.project.dir, 'noResults.txt')}`).shellOutput
         .stdout;
-      // eslint-disable-next-line no-console
-      console.log('res', util.inspect(result));
       // make sure we got a JSON object back
       const parsed = JSON.parse(result) as Record<string, unknown>;
       expect(Object.keys(parsed)).to.have.length;

From 91e05d153ad888f7a0807128289377e656e6cc40 Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Mon, 19 Aug 2024 15:10:04 -0600
Subject: [PATCH 06/12] chore: update --body flag to read file/stdin/value

---
 messages/graphql.md                 | 37 ++++++++++++++++++++++-------
 src/commands/api/request/graphql.ts | 26 ++++++++++----------
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/messages/graphql.md b/messages/graphql.md
index 6a386cf..6bdc2ea 100644
--- a/messages/graphql.md
+++ b/messages/graphql.md
@@ -1,22 +1,41 @@
 # summary
 
-Summary of a command.
+Execute GraphQL statements
 
 # description
 
-More information about a command. Don't repeat the summary.
+Run any valid GraphQL statement via the /graphql [API](https://developer.salesforce.com/docs/platform/graphql/guide/graphql-about.html)
 
-# flags.name.summary
+# examples
 
-Description of a flag.
+- Runs the graphql query directly via the command line
 
-# flags.name.description
+  <%= config.bin %> <%= command.id %> --body '{ "query": "query accounts { uiapi { query { Account { edges { node { Id \n Name { value } } } } } } }" }'
 
-More information about a flag. Don't repeat the summary.
+- Runs a mutation to create an Account, with an `example.txt` file, containing
 
-# examples
+```text
+mutation AccountExample{
+  uiapi {
+    AccountCreate(input: {
+      Account: {
+        Name: "Trailblazer Express"
+      }
+    }) {
+      Record {
+        Id
+        Name {
+          value
+        }
+      }
+    }
+  }
+}
+```
+
+<%= config.bin %> <%= command.id %> --body example.txt
 
-- <%= config.bin %> <%= command.id %>
+will create a new account returning specified fields (Id, Name)
 
 # flags.include.summary
 
@@ -32,4 +51,4 @@ Stream responses to a file.
 
 # flags.body.summary
 
-File to use as the body for the request. Specify "-" to read from standard input.
+File or content with GraphQL statement. Specify "-" to read from standard input.
diff --git a/src/commands/api/request/graphql.ts b/src/commands/api/request/graphql.ts
index 6639088..d897b84 100644
--- a/src/commands/api/request/graphql.ts
+++ b/src/commands/api/request/graphql.ts
@@ -6,10 +6,9 @@
  */
 
 import fs, { createWriteStream } from 'node:fs';
-import { EOL } from 'node:os';
 import * as os from 'node:os';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
-import { Messages, Org, SfError } from '@salesforce/core';
+import { Messages, Org, SFDX_HTTP_HEADERS, SfError } from '@salesforce/core';
 import { ProxyAgent } from 'proxy-agent';
 import ansis from 'ansis';
 import got from 'got';
@@ -40,6 +39,7 @@ export default class Graphql extends SfCommand<void> {
     }),
     body: Flags.string({
       summary: messages.getMessage('flags.body.summary'),
+      allowStdin: true,
       helpValue: 'file',
       required: true,
     }),
@@ -50,20 +50,22 @@ export default class Graphql extends SfCommand<void> {
 
     const org = flags['target-org'];
     const streamFile = flags['stream-to-file'];
+    const apiVersion = await org.retrieveMaxApiVersion();
+    const body = fs.existsSync(flags.body)
+      ? `{"query":"${fs.readFileSync(flags.body, 'utf8').replaceAll(os.EOL, '\\n').replaceAll('"', '\\"')}"}`
+      : flags.body;
 
     await org.refreshAuth();
-    const apiVersion = await org.retrieveMaxApiVersion();
 
-    const url = `${org.getField<string>(Org.Fields.INSTANCE_URL)}/services/data/v${apiVersion}/graphql`;
+    const url = new URL(`${org.getField<string>(Org.Fields.INSTANCE_URL)}/services/data/v${apiVersion}/graphql`);
 
     const options = {
       agent: { https: new ProxyAgent() },
       headers: {
-        'Content-type': 'application/json',
+        ...SFDX_HTTP_HEADERS,
         Authorization: `Bearer ${org.getConnection(apiVersion).getConnectionOptions().accessToken!}`,
-        ...{},
       },
-      body: `{"query":"${fs.readFileSync(flags.body, 'utf8').replaceAll(os.EOL, '\\n')}", "variables": {}}`,
+      body,
       throwHttpErrors: false,
       followRedirect: false,
     };
@@ -85,12 +87,10 @@ export default class Graphql extends SfCommand<void> {
 
       // Print HTTP response status and headers.
       if (flags.include) {
-        let httpInfo = `HTTP/${res.httpVersion} ${res.statusCode} ${EOL}`;
-
-        for (const [header] of Object.entries(res.headers)) {
-          httpInfo += `${ansis.blue.bold(header)}: ${res.headers[header] as string}${EOL}`;
-        }
-        this.log(httpInfo);
+        this.log(`HTTP/${res.httpVersion} ${res.statusCode}`);
+        Object.entries(res.headers).map(([header, value]) => {
+          this.log(`${ansis.blue.bold(header)}: ${Array.isArray(value) ? value.join(',') : value ?? '<undefined>'}`);
+        });
       }
 
       try {

From 4816fddc3556215703a5ce8c85e477916a43030f Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Wed, 21 Aug 2024 11:00:31 -0600
Subject: [PATCH 07/12] chore: share flags/methods

---
 messages/graphql.md                 |  8 ---
 messages/rest.md                    |  8 ---
 messages/shared.md                  |  7 +++
 src/commands/api/request/graphql.ts | 64 +++-----------------
 src/commands/api/request/rest.ts    | 59 ++----------------
 src/shared/methods.ts               | 25 --------
 src/shared/shared.ts                | 93 +++++++++++++++++++++++++++++
 7 files changed, 115 insertions(+), 149 deletions(-)
 create mode 100644 messages/shared.md
 delete mode 100644 src/shared/methods.ts
 create mode 100644 src/shared/shared.ts

diff --git a/messages/graphql.md b/messages/graphql.md
index 6bdc2ea..d5fb17c 100644
--- a/messages/graphql.md
+++ b/messages/graphql.md
@@ -37,18 +37,10 @@ mutation AccountExample{
 
 will create a new account returning specified fields (Id, Name)
 
-# flags.include.summary
-
-Include the HTTP response status and headers in the output.
-
 # flags.header.summary
 
 HTTP header in "key:value" format.
 
-# flags.stream-to-file.summary
-
-Stream responses to a file.
-
 # flags.body.summary
 
 File or content with GraphQL statement. Specify "-" to read from standard input.
diff --git a/messages/rest.md b/messages/rest.md
index 8203658..ee000d3 100644
--- a/messages/rest.md
+++ b/messages/rest.md
@@ -31,10 +31,6 @@ Make an authenticated HTTP request to Salesforce REST API and print the response
 
   <%= config.bin %> <%= command.id %> '/services/data/v46.0/sobjects/account/<Account ID>' --body "{\"BillingCity\": \"San Francisco\"}" --method PATCH
 
-# flags.include.summary
-
-Include the HTTP response status and headers in the output.
-
 # flags.method.summary
 
 HTTP method for the request.
@@ -43,10 +39,6 @@ HTTP method for the request.
 
 HTTP header in "key:value" format.
 
-# flags.stream-to-file.summary
-
-Stream responses to a file.
-
 # flags.body.summary
 
 File to use as the body for the request. Specify "-" to read from standard input; specify "" for an empty body.
diff --git a/messages/shared.md b/messages/shared.md
new file mode 100644
index 0000000..ff67e5a
--- /dev/null
+++ b/messages/shared.md
@@ -0,0 +1,7 @@
+# flags.include.summary
+
+Include the HTTP response status and headers in the output.
+
+# flags.stream-to-file.summary
+
+Stream responses to a file.
diff --git a/src/commands/api/request/graphql.ts b/src/commands/api/request/graphql.ts
index d897b84..d898101 100644
--- a/src/commands/api/request/graphql.ts
+++ b/src/commands/api/request/graphql.ts
@@ -5,14 +5,12 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import fs, { createWriteStream } from 'node:fs';
+import fs from 'node:fs';
 import * as os from 'node:os';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
-import { Messages, Org, SFDX_HTTP_HEADERS, SfError } from '@salesforce/core';
+import { Messages, Org, SFDX_HTTP_HEADERS } from '@salesforce/core';
 import { ProxyAgent } from 'proxy-agent';
-import ansis from 'ansis';
-import got from 'got';
-import type { AnyJson } from '@salesforce/ts-types';
+import { includeFlag, sendAndPrintRequest, streamToFileFlag } from '../../../shared/shared.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-api', 'graphql');
@@ -25,18 +23,8 @@ export default class Graphql extends SfCommand<void> {
 
   public static readonly flags = {
     'target-org': Flags.requiredOrg(),
-    'stream-to-file': Flags.string({
-      summary: messages.getMessage('flags.stream-to-file.summary'),
-      helpValue: 'Example: report.xlsx',
-      char: 'S',
-      exclusive: ['include'],
-    }),
-    include: Flags.boolean({
-      char: 'i',
-      summary: messages.getMessage('flags.include.summary'),
-      default: false,
-      exclusive: ['stream-to-file'],
-    }),
+    'stream-to-file': streamToFileFlag,
+    include: includeFlag,
     body: Flags.string({
       summary: messages.getMessage('flags.body.summary'),
       allowStdin: true,
@@ -51,9 +39,9 @@ export default class Graphql extends SfCommand<void> {
     const org = flags['target-org'];
     const streamFile = flags['stream-to-file'];
     const apiVersion = await org.retrieveMaxApiVersion();
-    const body = fs.existsSync(flags.body)
-      ? `{"query":"${fs.readFileSync(flags.body, 'utf8').replaceAll(os.EOL, '\\n').replaceAll('"', '\\"')}"}`
-      : flags.body;
+    const body = `{"query":"${(fs.existsSync(flags.body) ? fs.readFileSync(flags.body, 'utf8') : flags.body)
+      .replaceAll(os.EOL, '\\n')
+      .replaceAll('"', '\\"')}"}`;
 
     await org.refreshAuth();
 
@@ -70,40 +58,6 @@ export default class Graphql extends SfCommand<void> {
       followRedirect: false,
     };
 
-    if (streamFile) {
-      const responseStream = got.stream.post(url, options);
-      const fileStream = createWriteStream(streamFile);
-      responseStream.pipe(fileStream);
-
-      fileStream.on('finish', () => this.log(`File saved to ${streamFile}`));
-      fileStream.on('error', (error) => {
-        throw SfError.wrap(error);
-      });
-      responseStream.on('error', (error) => {
-        throw SfError.wrap(error);
-      });
-    } else {
-      const res = await got.post(url, options);
-
-      // Print HTTP response status and headers.
-      if (flags.include) {
-        this.log(`HTTP/${res.httpVersion} ${res.statusCode}`);
-        Object.entries(res.headers).map(([header, value]) => {
-          this.log(`${ansis.blue.bold(header)}: ${Array.isArray(value) ? value.join(',') : value ?? '<undefined>'}`);
-        });
-      }
-
-      try {
-        // Try to pretty-print JSON response.
-        this.styledJSON(JSON.parse(res.body) as AnyJson);
-      } catch (err) {
-        // If response body isn't JSON, just print it to stdout.
-        this.log(res.body);
-      }
-
-      if (res.statusCode >= 400) {
-        process.exitCode = 1;
-      }
-    }
+    await sendAndPrintRequest({ streamFile, url, options, include: flags.include, this: this });
   }
 }
diff --git a/src/commands/api/request/rest.ts b/src/commands/api/request/rest.ts
index fd678ca..52b65bb 100644
--- a/src/commands/api/request/rest.ts
+++ b/src/commands/api/request/rest.ts
@@ -4,16 +4,13 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { createWriteStream, readFileSync, existsSync } from 'node:fs';
+import { readFileSync, existsSync } from 'node:fs';
 import { join } from 'node:path';
-import got from 'got';
-import type { AnyJson } from '@salesforce/ts-types';
 import { ProxyAgent } from 'proxy-agent';
 import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
-import { Messages, Org, SFDX_HTTP_HEADERS, SfError } from '@salesforce/core';
+import { Messages, Org, SFDX_HTTP_HEADERS } from '@salesforce/core';
 import { Args } from '@oclif/core';
-import ansis from 'ansis';
-import { getHeaders } from '../../../shared/methods.js';
+import { getHeaders, includeFlag, sendAndPrintRequest, streamToFileFlag } from '../../../shared/shared.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-api', 'rest');
@@ -25,12 +22,7 @@ export class Rest extends SfCommand<void> {
   public static enableJsonFlag = false;
   public static readonly flags = {
     'target-org': Flags.requiredOrg(),
-    include: Flags.boolean({
-      char: 'i',
-      summary: messages.getMessage('flags.include.summary'),
-      default: false,
-      exclusive: ['stream-to-file'],
-    }),
+    include: includeFlag,
     method: Flags.option({
       options: ['GET', 'POST', 'PUT', 'PATCH', 'HEAD', 'DELETE', 'OPTIONS', 'TRACE'] as const,
       summary: messages.getMessage('flags.method.summary'),
@@ -43,12 +35,7 @@ export class Rest extends SfCommand<void> {
       char: 'H',
       multiple: true,
     }),
-    'stream-to-file': Flags.string({
-      summary: messages.getMessage('flags.stream-to-file.summary'),
-      helpValue: 'Example: report.xlsx',
-      char: 'S',
-      exclusive: ['include'],
-    }),
+    'stream-to-file': streamToFileFlag,
     body: Flags.string({
       summary: messages.getMessage('flags.body.summary'),
       allowStdin: true,
@@ -99,40 +86,6 @@ export class Rest extends SfCommand<void> {
       followRedirect: false,
     };
 
-    if (streamFile) {
-      const responseStream = got.stream(url, options);
-      const fileStream = createWriteStream(streamFile);
-      responseStream.pipe(fileStream);
-
-      fileStream.on('finish', () => this.log(`File saved to ${streamFile}`));
-      fileStream.on('error', (error) => {
-        throw SfError.wrap(error);
-      });
-      responseStream.on('error', (error) => {
-        throw SfError.wrap(error);
-      });
-    } else {
-      const res = await got(url, options);
-
-      // Print HTTP response status and headers.
-      if (flags.include) {
-        this.log(`HTTP/${res.httpVersion} ${res.statusCode}`);
-        Object.entries(res.headers).map(([header, value]) => {
-          this.log(`${ansis.blue.bold(header)}: ${Array.isArray(value) ? value.join(',') : value ?? '<undefined>'}`);
-        });
-      }
-
-      try {
-        // Try to pretty-print JSON response.
-        this.styledJSON(JSON.parse(res.body) as AnyJson);
-      } catch (err) {
-        // If response body isn't JSON, just print it to stdout.
-        this.log(res.body);
-      }
-
-      if (res.statusCode >= 400) {
-        process.exitCode = 1;
-      }
-    }
+    await sendAndPrintRequest({ streamFile, url, options, include: flags.include, this: this });
   }
 }
diff --git a/src/shared/methods.ts b/src/shared/methods.ts
deleted file mode 100644
index a492215..0000000
--- a/src/shared/methods.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2023, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-import { SfError } from '@salesforce/core';
-import type { Headers } from 'got';
-
-export function getHeaders(keyValPair: string[]): Headers {
-  const headers: { [key: string]: string } = {};
-
-  for (const header of keyValPair) {
-    const [key, ...rest] = header.split(':');
-    const value = rest.join(':').trim();
-    if (!key || !value) {
-      throw new SfError(`Failed to parse HTTP header: "${header}".`, 'Failed To Parse HTTP Header', [
-        'Make sure the header is in a "key:value" format, e.g. "Accept: application/json"',
-      ]);
-    }
-    headers[key] = value;
-  }
-
-  return headers;
-}
diff --git a/src/shared/shared.ts b/src/shared/shared.ts
new file mode 100644
index 0000000..7cd8368
--- /dev/null
+++ b/src/shared/shared.ts
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+import { createWriteStream } from 'node:fs';
+import { Messages, SfError } from '@salesforce/core';
+import type { Headers } from 'got';
+import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
+import ansis from 'ansis';
+import { AnyJson } from '@salesforce/ts-types';
+import got from 'got';
+
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/plugin-api', 'shared');
+export function getHeaders(keyValPair: string[]): Headers {
+  const headers: { [key: string]: string } = {};
+
+  for (const header of keyValPair) {
+    const [key, ...rest] = header.split(':');
+    const value = rest.join(':').trim();
+    if (!key || !value) {
+      throw new SfError(`Failed to parse HTTP header: "${header}".`, 'Failed To Parse HTTP Header', [
+        'Make sure the header is in a "key:value" format, e.g. "Accept: application/json"',
+      ]);
+    }
+    headers[key] = value;
+  }
+
+  return headers;
+}
+
+export async function sendAndPrintRequest(options: {
+  streamFile: string | undefined;
+  url: URL;
+  options: Record<string, unknown>;
+  include: boolean;
+  this: SfCommand<unknown>;
+}): Promise<void> {
+  if (options.streamFile) {
+    const responseStream = got.stream.post(options.url, options.options);
+    const fileStream = createWriteStream(options.streamFile);
+    responseStream.pipe(fileStream);
+
+    // we just ensured it existed with the 'if'
+    fileStream.on('finish', () => options.this.log(`File saved to ${options.streamFile!}`));
+    fileStream.on('error', (error) => {
+      throw SfError.wrap(error);
+    });
+    responseStream.on('error', (error) => {
+      throw SfError.wrap(error);
+    });
+  } else {
+    const res = await got.post(options.url, options.options);
+
+    // Print HTTP response status and headers.
+    if (options.include) {
+      options.this.log(`HTTP/${res.httpVersion} ${res.statusCode}`);
+      Object.entries(res.headers).map(([header, value]) => {
+        options.this.log(
+          `${ansis.blue.bold(header)}: ${Array.isArray(value) ? value.join(',') : value ?? '<undefined>'}`
+        );
+      });
+    }
+
+    try {
+      // Try to pretty-print JSON response.
+      options.this.styledJSON(JSON.parse(res.body) as AnyJson);
+    } catch (err) {
+      // If response body isn't JSON, just print it to stdout.
+      options.this.log(res.body);
+    }
+
+    if (res.statusCode >= 400) {
+      process.exitCode = 1;
+    }
+  }
+}
+
+export const includeFlag = Flags.boolean({
+  char: 'i',
+  summary: messages.getMessage('flags.include.summary'),
+  default: false,
+  exclusive: ['stream-to-file'],
+});
+
+export const streamToFileFlag = Flags.string({
+  summary: messages.getMessage('flags.stream-to-file.summary'),
+  helpValue: 'Example: report.xlsx',
+  char: 'S',
+  exclusive: ['include'],
+});

From 33d1173c42579a2142910435484767a9c43da66f Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Wed, 21 Aug 2024 13:37:32 -0600
Subject: [PATCH 08/12] chore: fix shared method, got method

---
 src/commands/api/request/rest.ts |  2 +-
 src/shared/shared.ts             | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/commands/api/request/rest.ts b/src/commands/api/request/rest.ts
index c813b7b..91c9cfe 100644
--- a/src/commands/api/request/rest.ts
+++ b/src/commands/api/request/rest.ts
@@ -22,8 +22,8 @@ export class Rest extends SfCommand<void> {
   public static enableJsonFlag = false;
   public static readonly flags = {
     'target-org': Flags.requiredOrg(),
-    include: includeFlag,
     'api-version': Flags.orgApiVersion(),
+    include: includeFlag,
     method: Flags.option({
       options: ['GET', 'POST', 'PUT', 'PATCH', 'HEAD', 'DELETE', 'OPTIONS', 'TRACE'] as const,
       summary: messages.getMessage('flags.method.summary'),
diff --git a/src/shared/shared.ts b/src/shared/shared.ts
index 7cd8368..790df98 100644
--- a/src/shared/shared.ts
+++ b/src/shared/shared.ts
@@ -39,7 +39,10 @@ export async function sendAndPrintRequest(options: {
   this: SfCommand<unknown>;
 }): Promise<void> {
   if (options.streamFile) {
-    const responseStream = got.stream.post(options.url, options.options);
+    const responseStream = options.options.method
+      ? got.stream(options.url, options.options)
+      : // default to 'POST' if not specified
+        got.stream.post(options.url, options.options);
     const fileStream = createWriteStream(options.streamFile);
     responseStream.pipe(fileStream);
 
@@ -52,8 +55,10 @@ export async function sendAndPrintRequest(options: {
       throw SfError.wrap(error);
     });
   } else {
-    const res = await got.post(options.url, options.options);
-
+    const res = options.options.method
+      ? // default to 'POST' if not specified
+        await got(options.url, options.options)
+      : await got.post(options.url, options.options);
     // Print HTTP response status and headers.
     if (options.include) {
       options.this.log(`HTTP/${res.httpVersion} ${res.statusCode}`);

From cbb8441b279cddc326eb7b4f5bd4919fae5e82d6 Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Wed, 21 Aug 2024 15:35:07 -0600
Subject: [PATCH 09/12] chore: --api-version

---
 command-snapshot.json               | 2 +-
 src/commands/api/request/graphql.ts | 6 +++---
 src/shared/shared.ts                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/command-snapshot.json b/command-snapshot.json
index 7d864c6..3aa0d6f 100644
--- a/command-snapshot.json
+++ b/command-snapshot.json
@@ -4,7 +4,7 @@
     "command": "api:request:graphql",
     "flagAliases": [],
     "flagChars": ["S", "i", "o"],
-    "flags": ["body", "flags-dir", "include", "json", "stream-to-file", "target-org"],
+    "flags": ["api-version", "body", "flags-dir", "include", "json", "stream-to-file", "target-org"],
     "plugin": "@salesforce/plugin-api"
   },
   {
diff --git a/src/commands/api/request/graphql.ts b/src/commands/api/request/graphql.ts
index d898101..a8bcdfa 100644
--- a/src/commands/api/request/graphql.ts
+++ b/src/commands/api/request/graphql.ts
@@ -23,6 +23,7 @@ export default class Graphql extends SfCommand<void> {
 
   public static readonly flags = {
     'target-org': Flags.requiredOrg(),
+    'api-version': Flags.orgApiVersion(),
     'stream-to-file': streamToFileFlag,
     include: includeFlag,
     body: Flags.string({
@@ -38,15 +39,14 @@ export default class Graphql extends SfCommand<void> {
 
     const org = flags['target-org'];
     const streamFile = flags['stream-to-file'];
-    const apiVersion = await org.retrieveMaxApiVersion();
+    const apiVersion = flags['api-version'] ?? (await org.retrieveMaxApiVersion());
     const body = `{"query":"${(fs.existsSync(flags.body) ? fs.readFileSync(flags.body, 'utf8') : flags.body)
       .replaceAll(os.EOL, '\\n')
       .replaceAll('"', '\\"')}"}`;
+    const url = new URL(`${org.getField<string>(Org.Fields.INSTANCE_URL)}/services/data/v${apiVersion}/graphql`);
 
     await org.refreshAuth();
 
-    const url = new URL(`${org.getField<string>(Org.Fields.INSTANCE_URL)}/services/data/v${apiVersion}/graphql`);
-
     const options = {
       agent: { https: new ProxyAgent() },
       headers: {
diff --git a/src/shared/shared.ts b/src/shared/shared.ts
index 790df98..2b37cdb 100644
--- a/src/shared/shared.ts
+++ b/src/shared/shared.ts
@@ -32,7 +32,7 @@ export function getHeaders(keyValPair: string[]): Headers {
 }
 
 export async function sendAndPrintRequest(options: {
-  streamFile: string | undefined;
+  streamFile?: string;
   url: URL;
   options: Record<string, unknown>;
   include: boolean;

From 529d77f3d690ec694199be92aadea0f180488b85 Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Wed, 21 Aug 2024 16:05:45 -0600
Subject: [PATCH 10/12] chore: example/classes

---
 messages/graphql.md                                      | 2 +-
 .../force-app/main/default/classes/MyClass.cls           | 9 ---------
 .../force-app/main/default/classes/MyClass.cls-meta.xml  | 5 -----
 3 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 test/test-files/data-project/force-app/main/default/classes/MyClass.cls
 delete mode 100644 test/test-files/data-project/force-app/main/default/classes/MyClass.cls-meta.xml

diff --git a/messages/graphql.md b/messages/graphql.md
index d5fb17c..414c091 100644
--- a/messages/graphql.md
+++ b/messages/graphql.md
@@ -10,7 +10,7 @@ Run any valid GraphQL statement via the /graphql [API](https://developer.salesfo
 
 - Runs the graphql query directly via the command line
 
-  <%= config.bin %> <%= command.id %> --body '{ "query": "query accounts { uiapi { query { Account { edges { node { Id \n Name { value } } } } } } }" }'
+  <%= config.bin %> <%= command.id %> --body "query accounts { uiapi { query { Account { edges { node { Id \n Name { value } } } } } } }"
 
 - Runs a mutation to create an Account, with an `example.txt` file, containing
 
diff --git a/test/test-files/data-project/force-app/main/default/classes/MyClass.cls b/test/test-files/data-project/force-app/main/default/classes/MyClass.cls
deleted file mode 100644
index 593739d..0000000
--- a/test/test-files/data-project/force-app/main/default/classes/MyClass.cls
+++ /dev/null
@@ -1,9 +0,0 @@
-public inherited sharing class MyClass {
-    public MyClass() {
-
-    }
-
-    public String toDO() {
-        return 'todo';
-    }
-}
diff --git a/test/test-files/data-project/force-app/main/default/classes/MyClass.cls-meta.xml b/test/test-files/data-project/force-app/main/default/classes/MyClass.cls-meta.xml
deleted file mode 100644
index 541584f..0000000
--- a/test/test-files/data-project/force-app/main/default/classes/MyClass.cls-meta.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>50.0</apiVersion>
-    <status>Active</status>
-</ApexClass>

From e148592afe0ca07e678948bb43479a75fa210cea Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Wed, 21 Aug 2024 16:08:01 -0600
Subject: [PATCH 11/12] chore: add .gitkeep in sample proj

---
 test/test-files/data-project/force-app/main/default/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/test-files/data-project/force-app/main/default/.gitkeep

diff --git a/test/test-files/data-project/force-app/main/default/.gitkeep b/test/test-files/data-project/force-app/main/default/.gitkeep
new file mode 100644
index 0000000..e69de29

From 322e995b9a9eaf06e91de4d2d1ea27bfa719246a Mon Sep 17 00:00:00 2001
From: Willie Ruemmele <willieruemmele@gmail.com>
Date: Wed, 21 Aug 2024 16:40:05 -0600
Subject: [PATCH 12/12] test: add NUT with --body and directly passing in
 grapql

---
 .../api/request/graphql/graphql.nut.ts        | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/test/commands/api/request/graphql/graphql.nut.ts b/test/commands/api/request/graphql/graphql.nut.ts
index d981e0d..7b69299 100644
--- a/test/commands/api/request/graphql/graphql.nut.ts
+++ b/test/commands/api/request/graphql/graphql.nut.ts
@@ -47,6 +47,37 @@ describe('api:request:graphql NUT', () => {
       expect(parsed.errors).to.deep.equal([]);
     });
 
+    it('get result in json format --body', () => {
+      const result = execCmd(
+        'api request graphql --body "query accounts { uiapi { query { Account { edges { node { Id Name { value } } } } } } }"'
+      ).shellOutput.stdout;
+
+      // make sure we got a JSON object back
+      const parsed = JSON.parse(result) as Record<string, unknown>;
+
+      expect(Object.keys(parsed)).to.have.length;
+
+      // @ts-expect-error graphql response, just access what we need without typing it
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      expect(parsed.data!.uiapi.query.Account.edges.length).to.equal(1);
+      expect(parsed.errors).to.deep.equal([]);
+    });
+
+    it('no results from --body', () => {
+      const result = execCmd(
+        'api request graphql  --body "query Address {  uiapi {   query {Address { edges {  node {    Id }  }  }  } }}"'
+      ).shellOutput.stdout;
+
+      // make sure we got a JSON object back
+      const parsed = JSON.parse(result) as Record<string, unknown>;
+      expect(Object.keys(parsed)).to.have.length;
+
+      // @ts-expect-error graphql response, just access what we need without typing it
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      expect(parsed.data!.uiapi.query.Address.edges.length).to.equal(0);
+      expect(parsed.errors).to.deep.equal([]);
+    });
+
     it('get no results correctly', () => {
       const result = execCmd(`api request graphql --body ${join(testSession.project.dir, 'noResults.txt')}`).shellOutput
         .stdout;