@salesforce/plugin-apex 1.5.1 → 2.2.0

package/README.md

@@ -44,7 +44,7 @@ $ NODE_OPTIONS=--inspect-brk bin/dev force:apex:log:list -u myOrg@example.com
 <br />
 ### Running the Test Suite
 
-Run the test suite locally by building the project first and then running the tests.
+Test the test suite locally by building the project first and then running the tests.
 
 ```
 $ yarn build
@@ -136,7 +136,7 @@ EXAMPLES
   $ sfdx force:apex:log:get -d Users/Desktop/logs -n 2
 ```
 
-_See code: [force/apex/log/get.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/log/get.ts)_
+_See code: [force/apex/log/log.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/log/get.ts)_
 <br /><br />
 
 ### `sfdx force:apex:log:list`
@@ -162,7 +162,7 @@ OPTIONS
       [default: warn] logging level for this command invocation
 
 DESCRIPTION
-  Run this command in a project to list the IDs and general information for all debug logs
+  Test this command in a project to list the IDs and general information for all debug logs
   in your default org.
   To fetch a specific log from your org, obtain the ID from this command's output, then run
   the “sfdx force:apex:log:get” command.
@@ -172,7 +172,7 @@ EXAMPLES
   $ sfdx force:apex:log:list -u me@my.org
 ```
 
-_See code: [force/apex/log/list.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/log/list.ts)_
+_See code: [force/apex/log/log.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/log/list.ts)_
 <br /><br />
 
 ### `sfdx force:apex:log:tail`
@@ -216,7 +216,7 @@ EXAMPLES
   $ sfdx force:apex:log:tail -c -s
 ```
 
-_See code: [force/apex/log/tail.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/log/tail.ts)_
+_See code: [force/apex/log/log.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/log/tail.ts)_
 <br /><br />
 
 ### `sfdx force:apex:execute`
@@ -262,7 +262,7 @@ EXAMPLES
   finished.
 ```
 
-_See code: [force/apex/execute.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/execute.ts)_
+_See code: [force/apex/test.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/execute.ts)_
 <br /><br />
 
 ### `sfdx force:apex:test:run`
@@ -355,7 +355,7 @@ EXAMPLES
   $ sfdx force:apex:test:run -l RunLocalTests -d <path to outputdir> -u me@my.org
 ```
 
-_See code: [force/apex/test/run.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/test/run.ts)_
+_See code: [force/apex/test/test.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/test/run.ts)_
 <br /><br />
 
 ### `sfdx force:apex:test:report`
@@ -375,7 +375,7 @@ OPTIONS
   -d, --outputdir=outputdir
       directory to store test result files
 
-  -i, --testrunid=testrunid
+  -i, --test-run-id=testrunid
       (required) the ID of the test run
 
   -r, --resultformat=(human|tap|junit|json)
@@ -414,6 +414,6 @@ EXAMPLES
   $ sfdx force:apex:test:report -i <test run id> -c -d <path to outputdir> -u me@myorg
 ```
 
-_See code: [force/apex/test/report.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/test/report.ts)_
+_See code: [force/apex/test/test.ts](https://github.com/salesforcecli/plugin-apex/blob/main/src/commands/force/apex/test/report.ts)_
 
 <!-- commandsstop -->

package/lib/commands/apex/get/log.d.ts

@@ -0,0 +1,20 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+export type LogGetResult = Array<{
+    log: string;
+} | string>;
+export default class Log extends SfCommand<LogGetResult> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly deprecateAliases = true;
+    static readonly aliases: string[];
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'log-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        number: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'output-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<LogGetResult>;
+}

package/lib/commands/apex/get/log.js

@@ -0,0 +1,73 @@
+"use strict";
+/*
+ * 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const apex_node_1 = require("@salesforce/apex-node");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const core_1 = require("@salesforce/core");
+const utils_1 = require("../../../utils");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-apex', 'get');
+class Log extends sf_plugins_core_1.SfCommand {
+    async run() {
+        const { flags } = await this.parse(Log);
+        const conn = flags['target-org'].getConnection(flags['api-version']);
+        const logService = new apex_node_1.LogService(conn);
+        const logResults = await logService.getLogs({
+            logId: flags['log-id'],
+            numberOfLogs: flags.number,
+            outputDir: flags['output-dir'],
+        });
+        if (logResults.length === 0) {
+            this.log(messages.getMessage('noResultsFound'));
+            return [];
+        }
+        if (flags['output-dir']) {
+            this.log(`Log files written to ${flags['output-dir']}`);
+            // TODO: look at this --outputdir will change what --json returns
+            return logResults.map((logResult) => logResult.log);
+        }
+        return logResults.map((logResult) => {
+            this.log((0, utils_1.colorLogs)(logResult.log));
+            return { log: logResult.log };
+        });
+    }
+}
+exports.default = Log;
+Log.summary = messages.getMessage('summary');
+Log.description = messages.getMessage('description');
+Log.examples = messages.getMessages('examples');
+Log.deprecateAliases = true;
+Log.aliases = ['force:apex:log:get'];
+Log.flags = {
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    loglevel: sf_plugins_core_1.loglevel,
+    'log-id': sf_plugins_core_1.Flags.salesforceId({
+        deprecateAliases: true,
+        aliases: ['logid'],
+        char: 'i',
+        summary: messages.getMessage('flags.log-id.summary'),
+        startsWith: '07L',
+        length: 'both',
+    }),
+    number: sf_plugins_core_1.Flags.integer({
+        char: 'n',
+        min: 1,
+        default: 1,
+        max: 25,
+        summary: messages.getMessage('flags.number.summary'),
+    }),
+    'output-dir': sf_plugins_core_1.Flags.directory({
+        aliases: ['outputdir', 'output-directory'],
+        deprecateAliases: true,
+        char: 'd',
+        summary: messages.getMessage('flags.output-dir.summary'),
+        description: messages.getMessage('flags.output-dir.description'),
+    }),
+};
+//# sourceMappingURL=log.js.map

package/lib/commands/apex/get/log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../../src/commands/apex/get/log.ts"],"names":[],"mappings":"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"}

package/lib/commands/apex/get/test.d.ts

@@ -0,0 +1,19 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { RunResult } from '../../../reporters';
+export default class Test extends SfCommand<RunResult> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly deprecateAliases = true;
+    static readonly aliases: string[];
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'test-run-id': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'code-coverage': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'output-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'result-format': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<RunResult>;
+}

package/lib/commands/apex/get/test.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/*
+ * 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
+ */
+const apex_node_1 = require("@salesforce/apex-node");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const core_1 = require("@salesforce/core");
+const reporters_1 = require("../../../reporters");
+const utils_1 = require("../../../utils");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-apex', 'report');
+class Test extends sf_plugins_core_1.SfCommand {
+    async run() {
+        const { flags } = await this.parse(Test);
+        // add listener for errors
+        process.on('uncaughtException', (err) => {
+            throw messages.createError('apexLibErr', [err.message]);
+        });
+        const conn = flags['target-org'].getConnection(flags['api-version']);
+        const testService = new apex_node_1.TestService(conn);
+        const result = await testService.reportAsyncResults(flags['test-run-id'], flags['code-coverage']);
+        const testReporter = new reporters_1.TestReporter(new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() }), conn, this.config.bin);
+        return testReporter.report(result, {
+            'output-dir': flags['output-dir'],
+            'result-format': flags['result-format'],
+            json: flags.json,
+            codeCoverage: flags['code-coverage'],
+        });
+    }
+}
+exports.default = Test;
+Test.summary = messages.getMessage('summary');
+Test.description = messages.getMessage('description');
+Test.examples = messages.getMessages('examples');
+Test.deprecateAliases = true;
+Test.aliases = ['force:apex:test:report'];
+Test.flags = {
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    loglevel: sf_plugins_core_1.loglevel,
+    'test-run-id': sf_plugins_core_1.Flags.salesforceId({
+        deprecateAliases: true,
+        aliases: ['testrunid'],
+        char: 'i',
+        summary: messages.getMessage('flags.test-run-id.summary'),
+        required: true,
+        startsWith: '707',
+        length: 'both',
+    }),
+    'code-coverage': sf_plugins_core_1.Flags.boolean({
+        aliases: ['codecoverage'],
+        deprecateAliases: true,
+        char: 'c',
+        summary: messages.getMessage('flags.code-coverage.summary'),
+    }),
+    'output-dir': sf_plugins_core_1.Flags.directory({
+        aliases: ['outputdir', 'output-directory'],
+        deprecateAliases: true,
+        char: 'd',
+        summary: messages.getMessage('flags.output-dir.summary'),
+    }),
+    'result-format': sf_plugins_core_1.Flags.string({
+        deprecateAliases: true,
+        aliases: ['resultformat'],
+        char: 'r',
+        summary: messages.getMessage('flags.result-format.summary'),
+        options: utils_1.resultFormat,
+    }),
+};
+//# sourceMappingURL=test.js.map

package/lib/commands/apex/get/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/commands/apex/get/test.ts"],"names":[],"mappings":"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"}

package/lib/commands/apex/list/log.d.ts

@@ -0,0 +1,17 @@
+import { LogRecord } from '@salesforce/apex-node';
+import { SfCommand } from '@salesforce/sf-plugins-core';
+export type LogListResult = LogRecord[];
+export default class Log extends SfCommand<LogListResult> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly deprecateAliases = true;
+    static readonly aliases: string[];
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<LogListResult>;
+    private formatTime;
+}

package/lib/commands/apex/list/log.js

@@ -0,0 +1,76 @@
+"use strict";
+/*
+ * 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const apex_node_1 = require("@salesforce/apex-node");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const core_1 = require("@salesforce/core");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-apex', 'list');
+class Log extends sf_plugins_core_1.SfCommand {
+    async run() {
+        const { flags } = await this.parse(Log);
+        const conn = flags['target-org'].getConnection(flags['api-version']);
+        const logService = new apex_node_1.LogService(conn);
+        const logRecords = await logService.getLogRecords();
+        if (logRecords.length === 0) {
+            this.log(messages.getMessage('noDebugLogsFound'));
+            return [];
+        }
+        logRecords.map((logRecord) => {
+            logRecord.StartTime = this.formatTime(logRecord.StartTime);
+        });
+        if (!flags.json) {
+            // while not required to prevent table output, save a few iterations if only printing json
+            const cleanLogs = logRecords.map((logRecord) => ({
+                app: logRecord.Application,
+                duration: String(logRecord.DurationMilliseconds),
+                id: logRecord.Id,
+                location: logRecord.Location,
+                size: String(logRecord.LogLength),
+                user: logRecord.LogUser.Name,
+                operation: logRecord.Operation,
+                request: logRecord.Request,
+                time: logRecord.StartTime,
+                status: logRecord.Status,
+            }));
+            this.table(cleanLogs, {
+                app: { header: messages.getMessage('appColHeader') },
+                duration: { header: messages.getMessage('durationColHeader') },
+                id: { header: messages.getMessage('idColHeader') },
+                location: { header: messages.getMessage('locationColHeader') },
+                size: { header: messages.getMessage('sizeColHeader') },
+                user: { header: messages.getMessage('userColHeader') },
+                operation: { header: messages.getMessage('operationColHeader') },
+                request: { header: messages.getMessage('requestColHeader') },
+                time: { header: messages.getMessage('timeColHeader') },
+                status: { header: messages.getMessage('statusColHeader') },
+            }, { 'no-truncate': true });
+        }
+        return logRecords;
+    }
+    // eslint-disable-next-line class-methods-use-this
+    formatTime(time) {
+        const milliIndex = time.indexOf('.');
+        if (milliIndex !== -1) {
+            return time.substring(0, milliIndex) + time.substring(milliIndex + 4);
+        }
+        return time;
+    }
+}
+exports.default = Log;
+Log.summary = messages.getMessage('summary');
+Log.description = messages.getMessage('description');
+Log.examples = messages.getMessages('examples');
+Log.deprecateAliases = true;
+Log.aliases = ['force:apex:log:list'];
+Log.flags = {
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    loglevel: sf_plugins_core_1.loglevel,
+};
+//# sourceMappingURL=log.js.map

package/lib/commands/apex/list/log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../../src/commands/apex/list/log.ts"],"names":[],"mappings":"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"}

package/lib/commands/apex/run/test.d.ts

@@ -0,0 +1,33 @@
+import { CancellationTokenSource, TestLevel, TestRunIdResult } from '@salesforce/apex-node';
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { Duration } from '@salesforce/kit';
+import { RunResult } from '../../../reporters';
+export declare const TestLevelValues: string[];
+export type RunCommandResult = RunResult | TestRunIdResult;
+export default class Test extends SfCommand<RunCommandResult> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly deprecateAliases = true;
+    static readonly aliases: string[];
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'code-coverage': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'output-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'test-level': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'class-names': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'result-format': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'suite-names': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        tests: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        wait: import("@oclif/core/lib/interfaces").OptionFlag<Duration | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        synchronous: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'detailed-coverage': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    protected cancellationTokenSource: CancellationTokenSource;
+    run(): Promise<RunCommandResult>;
+    validateFlags(codeCoverage?: boolean, resultFormatFlag?: string, classNames?: string, suiteNames?: string, tests?: string, synchronous?: boolean, testLevel?: TestLevel): Promise<TestLevel>;
+    private runTest;
+    private runTestAsynchronous;
+}

package/lib/commands/apex/run/test.js

@@ -0,0 +1,198 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestLevelValues = void 0;
+/*
+ * 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
+ */
+const apex_node_1 = require("@salesforce/apex-node");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const core_1 = require("@salesforce/core");
+const reporters_1 = require("../../../reporters");
+const utils_1 = require("../../../utils");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-apex', 'runtest');
+exports.TestLevelValues = ['RunLocalTests', 'RunAllTestsInOrg', 'RunSpecifiedTests'];
+class Test extends sf_plugins_core_1.SfCommand {
+    constructor() {
+        super(...arguments);
+        this.cancellationTokenSource = new apex_node_1.CancellationTokenSource();
+    }
+    async run() {
+        const { flags } = await this.parse(Test);
+        const testLevel = await this.validateFlags(flags['code-coverage'], flags['result-format'], flags['class-names'], flags['suite-names'], flags.tests, flags.synchronous, flags['test-level']);
+        // add listener for errors
+        process.on('uncaughtException', (err) => {
+            throw messages.createError('apexLibErr', [err.message]);
+        });
+        // graceful shutdown
+        const exitHandler = async () => {
+            await this.cancellationTokenSource.asyncCancel();
+            process.exit();
+        };
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        process.on('SIGINT', exitHandler);
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        process.on('SIGTERM', exitHandler);
+        const conn = flags['target-org'].getConnection(flags['api-version']);
+        const testService = new apex_node_1.TestService(conn);
+        // NOTE: This is a *bug*. Synchronous test runs should throw an error when multiple test classes are specified
+        // This was re-introduced due to https://github.com/forcedotcom/salesforcedx-vscode/issues/3154
+        // Address with W-9163533
+        const result = flags.synchronous && testLevel === "RunSpecifiedTests" /* TestLevel.RunSpecifiedTests */
+            ? await this.runTest(testService, flags, testLevel)
+            : await this.runTestAsynchronous(testService, flags, testLevel);
+        if (this.cancellationTokenSource.token.isCancellationRequested) {
+            throw new core_1.SfError('Cancelled');
+        }
+        if ('summary' in result) {
+            const testReporter = new reporters_1.TestReporter(new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() }), conn, this.config.bin);
+            return testReporter.report(result, {
+                wait: flags.wait,
+                'output-dir': flags['output-dir'],
+                'result-format': flags['result-format'],
+                'detailed-coverage': flags['detailed-coverage'],
+                synchronous: flags.synchronous,
+                json: flags.json,
+                codeCoverage: flags['code-coverage'],
+            });
+        }
+        else {
+            // async test run
+            this.log(messages.getMessage('runTestReportCommand', [this.config.bin, result.testRunId, conn.getUsername()]));
+            return result;
+        }
+    }
+    // eslint-disable-next-line class-methods-use-this,complexity
+    async validateFlags(codeCoverage, resultFormatFlag, classNames, suiteNames, tests, synchronous, testLevel) {
+        if (codeCoverage && !resultFormatFlag) {
+            return Promise.reject(new Error(messages.getMessage('missingReporterErr')));
+        }
+        if ((classNames && (suiteNames || tests)) || (suiteNames && tests)) {
+            return Promise.reject(new Error(messages.getMessage('classSuiteTestErr')));
+        }
+        if (synchronous && (suiteNames || (classNames && classNames.split(',').length > 1))) {
+            return Promise.reject(new Error(messages.getMessage('syncClassErr')));
+        }
+        if ((tests || classNames || suiteNames) && testLevel && testLevel !== 'RunSpecifiedTests') {
+            return Promise.reject(new Error(messages.getMessage('testLevelErr')));
+        }
+        let test;
+        if (testLevel) {
+            test = testLevel;
+        }
+        else if (classNames || suiteNames || tests) {
+            test = "RunSpecifiedTests" /* TestLevel.RunSpecifiedTests */;
+        }
+        else {
+            test = "RunLocalTests" /* TestLevel.RunLocalTests */;
+        }
+        return test;
+    }
+    async runTest(testService, flags, testLevel) {
+        const payload = {
+            ...(await testService.buildSyncPayload(testLevel, flags.tests, flags['class-names'])),
+            skipCodeCoverage: !flags['code-coverage'],
+        };
+        return (await testService.runTestSynchronous(payload, flags['code-coverage'], this.cancellationTokenSource.token));
+    }
+    async runTestAsynchronous(testService, flags, testLevel) {
+        const payload = {
+            ...(await testService.buildAsyncPayload(testLevel, flags.tests, flags['class-names'], flags['suite-names'])),
+            skipCodeCoverage: !flags['code-coverage'],
+        };
+        // cast as TestRunIdResult because we're building an async payload which will return an async result
+        return (await testService.runTestAsynchronous(payload, flags['code-coverage'], shouldImmediatelyReturn(flags.synchronous, flags['result-format'], flags.json, flags.wait), undefined, this.cancellationTokenSource.token));
+    }
+}
+exports.default = Test;
+Test.summary = messages.getMessage('summary');
+Test.description = messages.getMessage('description');
+Test.examples = messages.getMessages('examples');
+Test.deprecateAliases = true;
+Test.aliases = ['force:apex:test:run'];
+Test.flags = {
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    loglevel: sf_plugins_core_1.loglevel,
+    'code-coverage': sf_plugins_core_1.Flags.boolean({
+        aliases: ['codecoverage'],
+        deprecateAliases: true,
+        char: 'c',
+        summary: messages.getMessage('flags.code-coverage.summary'),
+    }),
+    'output-dir': sf_plugins_core_1.Flags.directory({
+        aliases: ['outputdir', 'output-directory'],
+        deprecateAliases: true,
+        char: 'd',
+        summary: messages.getMessage('flags.output-dir.summary'),
+    }),
+    'test-level': sf_plugins_core_1.Flags.string({
+        deprecateAliases: true,
+        aliases: ['testlevel'],
+        char: 'l',
+        summary: messages.getMessage('flags.test-level.summary'),
+        description: messages.getMessage('flags.test-level.description'),
+        options: exports.TestLevelValues,
+    }),
+    'class-names': sf_plugins_core_1.Flags.string({
+        deprecateAliases: true,
+        aliases: ['classnames'],
+        char: 'n',
+        summary: messages.getMessage('flags.class-names.summary'),
+        description: messages.getMessage('flags.class-names.description'),
+    }),
+    'result-format': sf_plugins_core_1.Flags.string({
+        deprecateAliases: true,
+        aliases: ['resultformat'],
+        char: 'r',
+        summary: messages.getMessage('flags.result-format.summary'),
+        options: utils_1.resultFormat,
+    }),
+    'suite-names': sf_plugins_core_1.Flags.string({
+        deprecateAliases: true,
+        aliases: ['suitenames'],
+        char: 's',
+        summary: messages.getMessage('flags.suite-names.summary'),
+        description: messages.getMessage('flags.suite-names.description'),
+    }),
+    tests: sf_plugins_core_1.Flags.string({
+        char: 't',
+        summary: messages.getMessage('flags.tests.summary'),
+        description: messages.getMessage('flags.tests.description'),
+    }),
+    wait: sf_plugins_core_1.Flags.duration({
+        unit: 'minutes',
+        char: 'w',
+        summary: messages.getMessage('flags.wait.summary'),
+    }),
+    synchronous: sf_plugins_core_1.Flags.boolean({
+        char: 'y',
+        summary: messages.getMessage('flags.synchronous.summary'),
+    }),
+    'detailed-coverage': sf_plugins_core_1.Flags.boolean({
+        deprecateAliases: true,
+        aliases: ['detailedcoverage'],
+        char: 'v',
+        summary: messages.getMessage('flags.detailed-coverage.summary'),
+        dependsOn: ['code-coverage'],
+    }),
+};
+/**
+ * Handles special exceptions where we don't want to return early
+ * with the testRunId.
+ **/
+const shouldImmediatelyReturn = (synchronous, resultFormatFlag, json, wait) => {
+    if (resultFormatFlag !== undefined) {
+        return false;
+    }
+    // when the user has explictly asked to wait for results, but didn't give a format
+    if (wait) {
+        return false;
+    }
+    // historical expectation to wait for results from a synchronous test run
+    return !(synchronous && !json);
+};
+//# sourceMappingURL=test.js.map

package/lib/commands/apex/run/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/commands/apex/run/test.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,qDAAqH;AACrH,iEAOqC;AACrC,2CAAqD;AAGrD,kDAA6D;AAC7D,0CAA8C;AAE9C,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,SAAS,CAAC,CAAC;AAEhE,QAAA,eAAe,GAAG,CAAC,eAAe,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;AAE1F,MAAqB,IAAK,SAAQ,2BAA2B;IAA7D;;QA2EY,4BAAuB,GAAG,IAAI,mCAAuB,EAAE,CAAC;IAuJpE,CAAC;IArJQ,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEzC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CACxC,KAAK,CAAC,eAAe,CAAC,EACtB,KAAK,CAAC,eAAe,CAAC,EACtB,KAAK,CAAC,aAAa,CAAC,EACpB,KAAK,CAAC,aAAa,CAAC,EACpB,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,YAAY,CAAc,CACjC,CAAC;QAEF,0BAA0B;QAC1B,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE;YACtC,MAAM,QAAQ,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,WAAW,GAAG,KAAK,IAAmB,EAAE;YAC5C,MAAM,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,CAAC;YACjD,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC,CAAC;QAEF,kEAAkE;QAClE,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAClC,kEAAkE;QAClE,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAEnC,MAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QACrE,MAAM,WAAW,GAAG,IAAI,uBAAW,CAAC,IAAI,CAAC,CAAC;QAE1C,8GAA8G;QAC9G,+FAA+F;QAC/F,yBAAyB;QACzB,MAAM,MAAM,GACV,KAAK,CAAC,WAAW,IAAI,SAAS,0DAAgC;YAC5D,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC;YACnD,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAEpE,IAAI,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,uBAAuB,EAAE;YAC9D,MAAM,IAAI,cAAO,CAAC,WAAW,CAAC,CAAC;SAChC;QAED,IAAI,SAAS,IAAI,MAAM,EAAE;YACvB,MAAM,YAAY,GAAG,IAAI,wBAAY,CAAC,IAAI,oBAAE,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAE1G,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE;gBACjC,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC;gBACjC,eAAe,EAAE,KAAK,CAAC,eAAe,CAAC;gBACvC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB,CAAC;gBAC/C,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,YAAY,EAAE,KAAK,CAAC,eAAe,CAAC;aACrC,CAAC,CAAC;SACJ;aAAM;YACL,iBAAiB;YACjB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/G,OAAO,MAAM,CAAC;SACf;IACH,CAAC;IAED,6DAA6D;IACtD,KAAK,CAAC,aAAa,CACxB,YAAsB,EACtB,gBAAyB,EACzB,UAAmB,EACnB,UAAmB,EACnB,KAAc,EACd,WAAqB,EACrB,SAAqB;QAErB,IAAI,YAAY,IAAI,CAAC,gBAAgB,EAAE;YACrC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;SAC7E;QAED,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,EAAE;YAClE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;SAC5E;QAED,IAAI,WAAW,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE;YACnF,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;SACvE;QAED,IAAI,CAAC,KAAK,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,SAAS,IAAI,SAAS,KAAK,mBAAmB,EAAE;YACzF,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;SACvE;QAED,IAAI,IAAe,CAAC;QACpB,IAAI,SAAS,EAAE;YACb,IAAI,GAAG,SAAS,CAAC;SAClB;aAAM,IAAI,UAAU,IAAI,UAAU,IAAI,KAAK,EAAE;YAC5C,IAAI,wDAA8B,CAAC;SACpC;aAAM;YACL,IAAI,gDAA0B,CAAC;SAChC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,WAAwB,EACxB,KAIC,EACD,SAAoB;QAEpB,MAAM,OAAO,GAAG;YACd,GAAG,CAAC,MAAM,WAAW,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;YACrF,gBAAgB,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC;SAC1C,CAAC;QACF,OAAO,CAAC,MAAM,WAAW,CAAC,kBAAkB,CAC1C,OAAO,EACP,KAAK,CAAC,eAAe,CAAC,EACtB,IAAI,CAAC,uBAAuB,CAAC,KAAK,CACnC,CAAe,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,WAAwB,EACxB,KASC,EACD,SAAoB;QAEpB,MAAM,OAAO,GAAG;YACd,GAAG,CAAC,MAAM,WAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;YAC5G,gBAAgB,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC;SAC1C,CAAC;QAEF,oGAAoG;QACpG,OAAO,CAAC,MAAM,WAAW,CAAC,mBAAmB,CAC3C,OAAO,EACP,KAAK,CAAC,eAAe,CAAC,EACtB,uBAAuB,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,EAC1F,SAAS,EACT,IAAI,CAAC,uBAAuB,CAAC,KAAK,CACnC,CAAoB,CAAC;IACxB,CAAC;;AAjOH,uBAkOC;AAjOwB,YAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,gBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,aAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,qBAAgB,GAAG,IAAI,CAAC;AACxB,YAAO,GAAG,CAAC,qBAAqB,CAAC,CAAC;AAElC,UAAK,GAAG;IAC7B,YAAY,EAAE,iDAA+B;IAC7C,aAAa,EAAE,mDAAiC;IAChD,QAAQ,EAAR,0BAAQ;IACR,eAAe,EAAE,uBAAK,CAAC,OAAO,CAAC;QAC7B,OAAO,EAAE,CAAC,cAAc,CAAC;QACzB,gBAAgB,EAAE,IAAI;QACtB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;KAC5D,CAAC;IACF,YAAY,EAAE,uBAAK,CAAC,SAAS,CAAC;QAC5B,OAAO,EAAE,CAAC,WAAW,EAAE,kBAAkB,CAAC;QAC1C,gBAAgB,EAAE,IAAI;QACtB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;KACzD,CAAC;IACF,YAAY,EAAE,uBAAK,CAAC,MAAM,CAAC;QACzB,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,WAAW,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;QACxD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAChE,OAAO,EAAE,uBAAe;KACzB,CAAC;IACF,aAAa,EAAE,uBAAK,CAAC,MAAM,CAAC;QAC1B,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,YAAY,CAAC;QACvB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;QACzD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC;KAClE,CAAC;IACF,eAAe,EAAE,uBAAK,CAAC,MAAM,CAAC;QAC5B,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,cAAc,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;QAC3D,OAAO,EAAE,oBAAY;KACtB,CAAC;IACF,aAAa,EAAE,uBAAK,CAAC,MAAM,CAAC;QAC1B,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,YAAY,CAAC;QACvB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;QACzD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC;KAClE,CAAC;IACF,KAAK,EAAE,uBAAK,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;QACnD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;KAC5D,CAAC;IACF,IAAI,EAAE,uBAAK,CAAC,QAAQ,CAAC;QACnB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;KACnD,CAAC;IACF,WAAW,EAAE,uBAAK,CAAC,OAAO,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;KAC1D,CAAC;IACF,mBAAmB,EAAE,uBAAK,CAAC,OAAO,CAAC;QACjC,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,kBAAkB,CAAC;QAC7B,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,iCAAiC,CAAC;QAC/D,SAAS,EAAE,CAAC,eAAe,CAAC;KAC7B,CAAC;CACH,CAAC;AA0JJ;;;IAGI;AACJ,MAAM,uBAAuB,GAAG,CAC9B,WAAqB,EACrB,gBAAyB,EACzB,IAAc,EACd,IAAe,EACN,EAAE;IACX,IAAI,gBAAgB,KAAK,SAAS,EAAE;QAClC,OAAO,KAAK,CAAC;KACd;IAED,kFAAkF;IAClF,IAAI,IAAI,EAAE;QACR,OAAO,KAAK,CAAC;KACd;IAED,yEAAyE;IACzE,OAAO,CAAC,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC,CAAC"}