chore: upd pkg json point at commands and format

Author: klewis-sfdc

package.json

@@ -4,7 +4,7 @@
   "version": "1.3.0",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/salesforcedx-apex/issues",
-  "main": "lib/index.js",
+  "main": "lib/src/index.js",
   "dependencies": {
     "@oclif/core": "^1.16.4",
     "@salesforce/apex-node": "1.3.0",
@@ -60,7 +60,7 @@
   ],
   "license": "BSD-3-Clause",
   "oclif": {
-    "commands": "./lib/commands",
+    "commands": "./lib/src/commands",
     "topics": {
       "force": {
         "external": true,
@@ -93,7 +93,7 @@
       "@salesforce/plugin-command-reference"
     ]
   },
-  "repository": "forcedotcom/salesforcedx-apex",
+  "repository": "salesforcecli/plugin-apex",
   "scripts": {
     "build": "shx rm -rf lib && tsc -b",
     "compile": "yarn build",

src/commands/force/apex/test/run.ts

@@ -18,17 +18,8 @@ import {
 import { flags, SfdxCommand } from '@salesforce/command';
 import { Messages, SfError } from '@salesforce/core';
 import { AnyJson } from '@salesforce/ts-types';
-import {
-  buildOutputDirConfig,
-  CliJsonFormat,
-  JsonReporter
-} from '../../../../reporters';
-import {
-  buildDescription,
-  logLevels,
-  resultFormat,
-  FAILURE_EXIT_CODE
-} from '../../../../utils';
+import { buildOutputDirConfig, CliJsonFormat, JsonReporter } from '../../../../reporters';
+import { buildDescription, logLevels, resultFormat, FAILURE_EXIT_CODE } from '../../../../utils';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.load('@salesforce/plugin-apex', 'run', [
@@ -60,11 +51,7 @@ const messages = Messages.load('@salesforce/plugin-apex', 'run', [
   'warningMessage'
 ]);
 
-export const TestLevelValues = [
-  'RunLocalTests',
-  'RunAllTestsInOrg',
-  'RunSpecifiedTests'
-];
+export const TestLevelValues = ['RunLocalTests', 'RunAllTestsInOrg', 'RunSpecifiedTests'];
 export default class Run extends SfdxCommand {
   protected static requiresUsername = true;
   protected cancellationTokenSource = new CancellationTokenSource();
@@ -150,9 +137,7 @@ export default class Run extends SfdxCommand {
 
     // add listener for errors
     process.on('uncaughtException', err => {
-      const formattedErr = this.formatError(
-        new SfError(messages.getMessage('apexLibErr', [err.message]))
-      );
+      const formattedErr = this.formatError(new SfError(messages.getMessage('apexLibErr', [err.message])));
       this.ux.error(...formattedErr);
       process.exit();
     });
@@ -178,11 +163,7 @@ export default class Run extends SfdxCommand {
     // This was re-introduced due to https://github.com/forcedotcom/salesforcedx-vscode/issues/3154
     // Address with W-9163533
     if (this.flags.synchronous && testLevel === TestLevel.RunSpecifiedTests) {
-      const payload = await testService.buildSyncPayload(
-        testLevel,
-        this.flags.tests,
-        this.flags.classnames
-      );
+      const payload = await testService.buildSyncPayload(testLevel, this.flags.tests, this.flags.classnames);
       payload.skipCodeCoverage = this.flags.codecoverage ? false : true;
       result = (await testService.runTestSynchronous(
         payload,
@@ -223,28 +204,19 @@ export default class Run extends SfdxCommand {
         this.flags.synchronous
       );
 
-      await testService.writeResultFiles(
-        result,
-        outputDirConfig,
-        this.flags.codecoverage
-      );
+      await testService.writeResultFiles(result, outputDirConfig, this.flags.codecoverage);
     }
 
     try {
       if (
         result.hasOwnProperty('summary') &&
-        (result as TestResult).summary.outcome ===
-          ApexTestRunResultStatus.Failed
+        (result as TestResult).summary.outcome === ApexTestRunResultStatus.Failed
       ) {
         process.exitCode = FAILURE_EXIT_CODE;
       }
       switch (this.flags.resultformat) {
         case 'human':
-          this.logHuman(
-            result as TestResult,
-            this.flags.detailedcoverage,
-            this.flags.outputdir
-          );
+          this.logHuman(result as TestResult, this.flags.detailedcoverage, this.flags.outputdir);
           break;
         case 'tap':
           this.logTap(result as TestResult);
@@ -263,26 +235,15 @@ export default class Run extends SfdxCommand {
           break;
         default:
           if (this.flags.synchronous || this.flags.wait) {
-            this.logHuman(
-              result as TestResult,
-              this.flags.detailedcoverage,
-              this.flags.outputdir
-            );
+            this.logHuman(result as TestResult, this.flags.detailedcoverage, this.flags.outputdir);
           } else {
-            const id = (result as TestRunIdResult).testRunId;
-            this.ux.log(
-              messages.getMessage('runTestReportCommand', [
-                id,
-                this.org?.getUsername()
-              ])
-            );
+            const id: TestRunIdResult = ((result as TestResult).tests[0].id as unknown) as TestRunIdResult;
+            this.ux.log(messages.getMessage('runTestReportCommand', [String(id), this.org?.getUsername()]));
           }
       }
     } catch (e) {
       this.ux.logJson(result);
-      const msg = messages.getMessage('testResultProcessErr', [
-        (e as Error).message
-      ]);
+      const msg = messages.getMessage('testResultProcessErr', [(e as Error).message]);
       this.ux.error(msg);
     }
 
@@ -291,24 +252,19 @@ export default class Run extends SfdxCommand {
 
   public async validateFlags(): Promise<void> {
     if (this.flags.codecoverage && !this.flags.resultformat) {
-      return Promise.reject(
-        new Error(messages.getMessage('missingReporterErr'))
-      );
+      return Promise.reject(new Error(messages.getMessage('missingReporterErr')));
     }
 
     if (
       (this.flags.classnames && (this.flags.suitenames || this.flags.tests)) ||
       (this.flags.suitenames && this.flags.tests)
     ) {
-      return Promise.reject(
-        new Error(messages.getMessage('classSuiteTestErr'))
-      );
+      return Promise.reject(new Error(messages.getMessage('classSuiteTestErr')));
     }
 
     if (
       this.flags.synchronous &&
-      (this.flags.suitenames ||
-        (this.flags.classnames && this.flags.classnames.split(',').length > 1))
+      (this.flags.suitenames || (this.flags.classnames && this.flags.classnames.split(',').length > 1))
     ) {
       return Promise.reject(new Error(messages.getMessage('syncClassErr')));
     }
@@ -326,11 +282,7 @@ export default class Run extends SfdxCommand {
     let testLevel: TestLevel;
     if (this.flags.testlevel) {
       testLevel = this.flags.testlevel;
-    } else if (
-      this.flags.classnames ||
-      this.flags.suitenames ||
-      this.flags.tests
-    ) {
+    } else if (this.flags.classnames || this.flags.suitenames || this.flags.tests) {
       testLevel = TestLevel.RunSpecifiedTests;
     } else {
       testLevel = TestLevel.RunLocalTests;
@@ -339,11 +291,7 @@ export default class Run extends SfdxCommand {
     return testLevel;
   }
 
-  private logHuman(
-    result: TestResult,
-    detailedCoverage: boolean,
-    outputDir: string
-  ): void {
+  private logHuman(result: TestResult, detailedCoverage: boolean, outputDir: string): void {
     if (outputDir) {
       this.ux.log(messages.getMessage('outputDirHint', [outputDir]));
     }
@@ -363,19 +311,13 @@ export default class Run extends SfdxCommand {
     this.ux.log(reporter.format(result));
   }
 
-  private formatResultInJson(
-    result: TestResult | TestRunIdResult
-  ): CliJsonFormat | TestRunIdResult {
+  private formatResultInJson(result: TestResult | TestRunIdResult): CliJsonFormat | TestRunIdResult {
     try {
       const reporter = new JsonReporter();
-      return result.hasOwnProperty('summary')
-        ? reporter.format(result as TestResult)
-        : (result as TestRunIdResult);
+      return result.hasOwnProperty('summary') ? reporter.format(result as TestResult) : (result as TestRunIdResult);
     } catch (e) {
       this.ux.logJson(result);
-      const msg = messages.getMessage('testResultProcessErr', [
-        (e as Error).message
-      ]);
+      const msg = messages.getMessage('testResultProcessErr', [(e as Error).message]);
       this.ux.error(msg);
       throw e;
     }

test/commands/force/apex/execute.test.ts

@@ -12,8 +12,7 @@ import { createSandbox, SinonSandbox } from 'sinon';
 import { Connection, Org } from '@salesforce/core';
 
 describe('force:apex:execute', () => {
-  const log =
-    '47.0 APEX_CODE,DEBUG;APEX_PROFILING,INFO\nExecute Anonymous: System.assert(true);|EXECUTION_FINISHED\n';
+  const log = '47.0 APEX_CODE,DEBUG;APEX_PROFILING,INFO\nExecute Anonymous: System.assert(true);|EXECUTION_FINISHED\n';
   const successJsonResult = {
     column: -1,
     line: -1,
@@ -89,8 +88,7 @@ describe('force:apex:execute', () => {
   };
 
   const successfulResponse = `Compiled successfully.\nExecuted successfully.\n\n${log}\n`;
-  const compileResponse =
-    'Error: Line: 11, Column: 1\nError: problem compiling\n\n';
+  const compileResponse = 'Error: Line: 11, Column: 1\nError: problem compiling\n\n';
   const runtimeResponse = `Compiled successfully.\nError: problem at runtime\nError: Issue in mock file\n\n${log}\n`;
   const TEST_USERNAME = '[email protected]';
 
@@ -100,9 +98,7 @@ describe('force:apex:execute', () => {
     sandboxStub = createSandbox();
 
     sandboxStub.stub(Org, 'create').resolves(Org.prototype);
-    sandboxStub
-      .stub(Org.prototype, 'getConnection')
-      .returns(Connection.prototype);
+    sandboxStub.stub(Org.prototype, 'getConnection').returns(Connection.prototype);
     sandboxStub.stub(Org.prototype, 'getUsername').returns(TEST_USERNAME);
     sandboxStub.stub(Org.prototype, 'getOrgId').returns('abc123');
   });
@@ -116,21 +112,12 @@ describe('force:apex:execute', () => {
     .withConnectionRequest(() => {
       return Promise.resolve(soapResponse);
     })
-    .stub(
-      ExecuteService.prototype,
-      'readApexFile',
-      () => 'System.assert(true);'
-    )
+    .stub(ExecuteService.prototype, 'readApexFile', () => 'System.assert(true);')
     .stub(ExecuteService.prototype, 'buildExecRequest', () => {
       'fakeData';
     })
     .stdout()
-    .command([
-      'force:apex:execute',
-      '--apexcodefile',
-      path.join('Users', 'test', 'path', 'to', 'file'),
-      '--json'
-    ])
+    .command(['force:apex:execute', '--apexcodefile', path.join('Users', 'test', 'path', 'to', 'file'), '--json'])
     .it('runs command with filepath flag and successful result', ctx => {
       const result = ctx.stdout;
       expect(result).to.not.be.empty;
@@ -146,21 +133,12 @@ describe('force:apex:execute', () => {
     .withConnectionRequest(() => {
       return Promise.resolve(soapResponse);
     })
-    .stub(
-      ExecuteService.prototype,
-      'getUserInput',
-      () => 'System.assert(true);'
-    )
+    .stub(ExecuteService.prototype, 'getUserInput', () => 'System.assert(true);')
     .stub(ExecuteService.prototype, 'buildExecRequest', () => {
       'fakeData';
     })
     .stdout()
-    .command([
-      'force:apex:execute',
-      '--targetusername',
-      '[email protected]',
-      '--json'
-    ])
+    .command(['force:apex:execute', '--targetusername', '[email protected]', '--json'])
     .it('runs default command with json flag and successful result', ctx => {
       const result = ctx.stdout;
       expect(result).to.not.be.empty;
@@ -181,12 +159,7 @@ describe('force:apex:execute', () => {
       'fakeData';
     })
     .stdout()
-    .command([
-      'force:apex:execute',
-      '--targetusername',
-      '[email protected]',
-      '--json'
-    ])
+    .command(['force:apex:execute', '--targetusername', '[email protected]', '--json'])
     .it('runs default command with json flag and compile problem', ctx => {
       const result = ctx.stdout;
       expect(result).to.not.be.empty;
@@ -200,10 +173,10 @@ describe('force:apex:execute', () => {
     .withConnectionRequest(() => {
       return Promise.resolve(soapResponse);
     })
-    .stub(ExecuteService.prototype, 'getUserInput', () => 'System.assert(true)')
-    .stub(ExecuteService.prototype, 'buildExecRequest', () => {
-      'fakeData';
-    })
+    // .stub(ExecuteService.prototype, 'getUserInput', () => 'System.assert(true)')
+    // .stub(ExecuteService.prototype, 'buildExecRequest', () => {
+    //   'fakeData';
+    // })
     .stdout()
     .command(['force:apex:execute', '--targetusername', '[email protected]'])
     .it('runs default command successfully with human readable output', ctx => {
@@ -223,14 +196,11 @@ describe('force:apex:execute', () => {
     })
     .stdout()
     .command(['force:apex:execute', '--targetusername', '[email protected]'])
-    .it(
-      'runs default command with compile issue in human readable output',
-      ctx => {
-        const result = ctx.stdout;
-        expect(result).to.not.be.empty;
-        expect(result).to.eql(compileResponse);
-      }
-    );
+    .it('runs default command with compile issue in human readable output', ctx => {
+      const result = ctx.stdout;
+      expect(result).to.not.be.empty;
+      expect(result).to.eql(compileResponse);
+    });
 
   test
     .withOrg({ username: '[email protected]' }, true)
@@ -243,12 +213,9 @@ describe('force:apex:execute', () => {
     })
     .stdout()
     .command(['force:apex:execute', '--targetusername', '[email protected]'])
-    .it(
-      'runs default command with runtime issue in human readable output',
-      ctx => {
-        const result = ctx.stdout;
-        expect(result).to.not.be.empty;
-        expect(result).to.eql(runtimeResponse);
-      }
-    );
+    .it('runs default command with runtime issue in human readable output', ctx => {
+      const result = ctx.stdout;
+      expect(result).to.not.be.empty;
+      expect(result).to.eql(runtimeResponse);
+    });
 });