@salesforce/plugin-deploy-retrieve 1.8.6 → 1.8.7

package/lib/commands/{deploy/metadata → project/deploy}/preview.js

@@ -19,6 +19,7 @@ class DeployMetadataPreview extends sf_plugins_core_1.SfCommand {
     async run() {
         const { flags } = await this.parse(DeployMetadataPreview);
         const deploySpecified = [flags.manifest, flags.metadata, flags['source-dir']].some((f) => f !== undefined);
+        const forceIgnore = source_deploy_retrieve_1.ForceIgnore.findAndCreate(this.project.getDefaultPackage().path);
         // we'll need STL both to check conflicts and to get the list of local changes if no flags are provided
         const stl = flags['ignore-conflicts'] && deploySpecified
             ? undefined
@@ -26,7 +27,6 @@ class DeployMetadataPreview extends sf_plugins_core_1.SfCommand {
                 org: flags['target-org'],
                 project: this.project,
             });
-        const forceIgnore = source_deploy_retrieve_1.ForceIgnore.findAndCreate(this.project.getDefaultPackage().path);
         const [componentSet, filesWithConflicts] = await Promise.all([
             (0, deploy_1.buildComponentSet)({ ...flags, 'target-org': flags['target-org'].getUsername() }, stl),
             (0, previewOutput_1.getConflictFiles)(stl, flags['ignore-conflicts']),
@@ -49,7 +49,8 @@ DeployMetadataPreview.description = messages.getMessage('description');
 DeployMetadataPreview.summary = messages.getMessage('summary');
 DeployMetadataPreview.examples = messages.getMessages('examples');
 DeployMetadataPreview.requiresProject = true;
-DeployMetadataPreview.state = 'beta';
+DeployMetadataPreview.aliases = ['deploy:metadata:preview'];
+DeployMetadataPreview.deprecateAliases = true;
 DeployMetadataPreview.flags = {
     'ignore-conflicts': sf_plugins_core_1.Flags.boolean({
         char: 'c',

package/lib/commands/project/deploy/preview.js.map

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

package/lib/commands/{deploy/metadata → project/deploy}/quick.d.ts

@@ -7,7 +7,8 @@ export default class DeployMetadataQuick extends SfCommand<DeployResultJson> {
     static readonly summary: string;
     static readonly examples: string[];
     static readonly requiresProject = true;
-    static readonly state = "beta";
+    static readonly aliases: string[];
+    static readonly deprecateAliases = true;
     static readonly flags: {
         async: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         concise: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
@@ -16,6 +17,7 @@ export default class DeployMetadataQuick extends SfCommand<DeployResultJson> {
         'use-most-recent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         wait: import("@oclif/core/lib/interfaces").OptionFlag<Duration, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static errorCodes: import("@oclif/core").HelpSection;
     run(): Promise<DeployResultJson>;

package/lib/commands/{deploy/metadata → project/deploy}/quick.js

@@ -15,28 +15,29 @@ const deploy_1 = require("../../../utils/deploy");
 const deployCache_1 = require("../../../utils/deployCache");
 const errorCodes_1 = require("../../../utils/errorCodes");
 const output_1 = require("../../../utils/output");
+const asyncDeployResultFormatter_1 = require("../../../formatters/asyncDeployResultFormatter");
+const deployResultFormatter_1 = require("../../../formatters/deployResultFormatter");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata.quick');
 class DeployMetadataQuick extends sf_plugins_core_1.SfCommand {
     async run() {
-        const { flags } = await this.parse(DeployMetadataQuick);
-        const cache = await deployCache_1.DeployCache.create();
+        const [{ flags }, cache] = await Promise.all([this.parse(DeployMetadataQuick), deployCache_1.DeployCache.create()]);
         const jobId = cache.resolveLatest(flags['use-most-recent'], flags['job-id'], false);
         const deployOpts = cache.get(jobId) ?? {};
         const org = flags['target-org'] ?? (await core_1.Org.create({ aliasOrUsername: deployOpts['target-org'] }));
-        const api = await (0, deploy_1.resolveApi)();
-        await org.getConnection().deployRecentValidation({ id: jobId, rest: api === 'REST' });
+        const api = await (0, deploy_1.resolveApi)(this.configAggregator);
+        await org.getConnection(flags['api-version']).deployRecentValidation({ id: jobId, rest: api === 'REST' });
         const componentSet = await (0, deploy_1.buildComponentSet)({ ...deployOpts, wait: flags.wait });
         this.log((0, output_1.getVersionMessage)('Deploying', componentSet, api));
         this.log(`Deploy ID: ${(0, chalk_1.bold)(jobId)}`);
         if (flags.async) {
-            const asyncFormatter = new output_1.AsyncDeployResultFormatter(jobId);
+            const asyncFormatter = new asyncDeployResultFormatter_1.AsyncDeployResultFormatter(jobId, this.config.bin);
             if (!this.jsonEnabled())
                 asyncFormatter.display();
             return asyncFormatter.getJson();
         }
         const result = await (0, deploy_1.poll)(org, jobId, flags.wait, componentSet);
-        const formatter = new output_1.DeployResultFormatter(result, flags);
+        const formatter = new deployResultFormatter_1.DeployResultFormatter(result, flags);
         if (!this.jsonEnabled())
             formatter.display();
         await deployCache_1.DeployCache.update(jobId, { status: result.response.status });
@@ -63,7 +64,8 @@ DeployMetadataQuick.description = messages.getMessage('description');
 DeployMetadataQuick.summary = messages.getMessage('summary');
 DeployMetadataQuick.examples = messages.getMessages('examples');
 DeployMetadataQuick.requiresProject = true;
-DeployMetadataQuick.state = 'beta';
+DeployMetadataQuick.aliases = ['deploy:metadata:quick'];
+DeployMetadataQuick.deprecateAliases = true;
 DeployMetadataQuick.flags = {
     async: sf_plugins_core_1.Flags.boolean({
         summary: messages.getMessage('flags.async.summary'),
@@ -107,6 +109,11 @@ DeployMetadataQuick.flags = {
         min: 1,
         exclusive: ['async'],
     }),
+    'api-version': sf_plugins_core_1.Flags.orgApiVersion({
+        char: 'a',
+        summary: messages.getMessage('flags.api-version.summary'),
+        description: messages.getMessage('flags.api-version.description'),
+    }),
 };
 DeployMetadataQuick.errorCodes = (0, sf_plugins_core_1.toHelpSection)('ERROR CODES', errorCodes_1.DEPLOY_STATUS_CODES_DESCRIPTIONS);
 //# sourceMappingURL=quick.js.map

package/lib/commands/project/deploy/quick.js.map

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

package/lib/commands/{deploy/metadata → project/deploy}/report.d.ts

@@ -5,10 +5,14 @@ export default class DeployMetadataReport extends SfCommand<DeployResultJson> {
     static readonly summary: string;
     static readonly examples: string[];
     static readonly requiresProject = true;
-    static readonly state = "beta";
+    static readonly aliases: string[];
+    static readonly deprecateAliases = true;
     static readonly flags: {
         'job-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'use-most-recent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'coverage-formatters': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        junit: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'results-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<DeployResultJson>;
 }

package/lib/commands/{deploy/metadata → project/deploy}/report.js

@@ -12,20 +12,27 @@ const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const deploy_1 = require("../../../utils/deploy");
 const deployCache_1 = require("../../../utils/deployCache");
-const output_1 = require("../../../utils/output");
+const deployReportResultFormatter_1 = require("../../../formatters/deployReportResultFormatter");
+const types_1 = require("../../../utils/types");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata.report');
 class DeployMetadataReport extends sf_plugins_core_1.SfCommand {
     async run() {
-        const flags = (await this.parse(DeployMetadataReport)).flags;
-        const cache = await deployCache_1.DeployCache.create();
+        const [{ flags }, cache] = await Promise.all([this.parse(DeployMetadataReport), deployCache_1.DeployCache.create()]);
         const jobId = cache.resolveLatest(flags['use-most-recent'], flags['job-id']);
         const deployOpts = cache.get(jobId);
         const org = await core_1.Org.create({ aliasOrUsername: deployOpts['target-org'] });
-        const deployStatus = await org.getConnection().metadata.checkDeployStatus(jobId, true);
-        const componentSet = await (0, deploy_1.buildComponentSet)({ ...deployOpts, wait: kit_1.Duration.minutes(deployOpts.wait) });
+        const [deployStatus, componentSet] = await Promise.all([
+            // we'll use whatever the org supports since we can't specify the org
+            // eslint-disable-next-line sf-plugin/get-connection-with-version
+            org.getConnection().metadata.checkDeployStatus(jobId, true),
+            (0, deploy_1.buildComponentSet)({ ...deployOpts, wait: kit_1.Duration.minutes(deployOpts.wait) }),
+        ]);
         const result = new source_deploy_retrieve_1.DeployResult(deployStatus, componentSet);
-        const formatter = new output_1.DeployReportResultFormatter(result, deployOpts);
+        const formatter = new deployReportResultFormatter_1.DeployReportResultFormatter(result, {
+            ...deployOpts,
+            ...{ 'target-org': org },
+        });
         if (!this.jsonEnabled())
             formatter.display();
         return formatter.getJson();
@@ -36,7 +43,8 @@ DeployMetadataReport.description = messages.getMessage('description');
 DeployMetadataReport.summary = messages.getMessage('summary');
 DeployMetadataReport.examples = messages.getMessages('examples');
 DeployMetadataReport.requiresProject = true;
-DeployMetadataReport.state = 'beta';
+DeployMetadataReport.aliases = ['deploy:metadata:report'];
+DeployMetadataReport.deprecateAliases = true;
 DeployMetadataReport.flags = {
     'job-id': sf_plugins_core_1.Flags.salesforceId({
         char: 'i',
@@ -51,5 +59,15 @@ DeployMetadataReport.flags = {
         summary: messages.getMessage('flags.use-most-recent.summary'),
         exactlyOne: ['use-most-recent', 'job-id'],
     }),
+    'coverage-formatters': sf_plugins_core_1.Flags.string({
+        multiple: true,
+        summary: messages.getMessage('flags.coverage-formatters.summary'),
+        options: types_1.reportsFormatters,
+    }),
+    junit: sf_plugins_core_1.Flags.boolean({ summary: messages.getMessage('flags.junit.summary') }),
+    'results-dir': sf_plugins_core_1.Flags.directory({
+        dependsOn: ['junit', 'coverage-formatters'],
+        summary: messages.getMessage('flags.results-dir.summary'),
+    }),
 };
 //# sourceMappingURL=report.js.map

package/lib/commands/project/deploy/report.js.map

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

package/lib/commands/{deploy/metadata → project/deploy}/resume.d.ts

@@ -6,13 +6,17 @@ export default class DeployMetadataResume extends SfCommand<DeployResultJson> {
     static readonly summary: string;
     static readonly examples: string[];
     static readonly requiresProject = true;
-    static readonly state = "beta";
+    static readonly aliases: string[];
+    static readonly deprecateAliases = true;
     static readonly flags: {
         concise: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'job-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'use-most-recent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         wait: import("@oclif/core/lib/interfaces").OptionFlag<Duration | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'coverage-formatters': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        junit: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'results-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static envVariablesSection: import("@oclif/core").HelpSection;
     static errorCodes: import("@oclif/core").HelpSection;

package/lib/commands/{deploy/metadata → project/deploy}/resume.js

@@ -11,7 +11,9 @@ const core_1 = require("@salesforce/core");
 const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const kit_1 = require("@salesforce/kit");
 const output_1 = require("../../../utils/output");
+const deployResultFormatter_1 = require("../../../formatters/deployResultFormatter");
 const progressBar_1 = require("../../../utils/progressBar");
+const types_1 = require("../../../utils/types");
 const deploy_1 = require("../../../utils/deploy");
 const deployCache_1 = require("../../../utils/deployCache");
 const errorCodes_1 = require("../../../utils/errorCodes");
@@ -19,23 +21,23 @@ core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata.resume');
 class DeployMetadataResume extends sf_plugins_core_1.SfCommand {
     async run() {
-        const { flags } = await this.parse(DeployMetadataResume);
-        const cache = await deployCache_1.DeployCache.create();
+        const [{ flags }, cache] = await Promise.all([this.parse(DeployMetadataResume), deployCache_1.DeployCache.create()]);
         const jobId = cache.resolveLatest(flags['use-most-recent'], flags['job-id']);
-        const deployOpts = cache.get(jobId);
+        // if it was async before, then it should not be async now.
+        const deployOpts = { ...cache.get(jobId), async: false };
         if ((0, deploy_1.isNotResumable)(deployOpts.status)) {
             throw messages.createError('error.DeployNotResumable', [jobId, deployOpts.status]);
         }
         const wait = flags.wait ?? kit_1.Duration.minutes(deployOpts.wait);
         const { deploy, componentSet } = await (0, deploy_1.executeDeploy)(
         // there will always be conflicts on a resume if anything deployed--the changes on the server are not synced to local
-        { ...deployOpts, wait, 'dry-run': false, 'ignore-conflicts': true }, this.project, jobId);
+        { ...deployOpts, wait, 'dry-run': false, 'ignore-conflicts': true }, this.config.bin, this.project, jobId);
         this.log((0, output_1.getVersionMessage)('Resuming Deployment', componentSet, deployOpts.api));
         this.log(`Deploy ID: ${(0, chalk_1.bold)(jobId)}`);
         new progressBar_1.DeployProgress(deploy, this.jsonEnabled()).start();
         const result = await deploy.pollStatus(500, wait.seconds);
         process.exitCode = (0, deploy_1.determineExitCode)(result);
-        const formatter = new output_1.DeployResultFormatter(result, {
+        const formatter = new deployResultFormatter_1.DeployResultFormatter(result, {
             ...flags,
             verbose: deployOpts.verbose,
             concise: deployOpts.concise,
@@ -52,7 +54,8 @@ DeployMetadataResume.description = messages.getMessage('description');
 DeployMetadataResume.summary = messages.getMessage('summary');
 DeployMetadataResume.examples = messages.getMessages('examples');
 DeployMetadataResume.requiresProject = true;
-DeployMetadataResume.state = 'beta';
+DeployMetadataResume.aliases = ['deploy:metadata:resume'];
+DeployMetadataResume.deprecateAliases = true;
 DeployMetadataResume.flags = {
     concise: sf_plugins_core_1.Flags.boolean({
         summary: messages.getMessage('flags.concise.summary'),
@@ -75,6 +78,8 @@ DeployMetadataResume.flags = {
         summary: messages.getMessage('flags.verbose.summary'),
         exclusive: ['concise'],
     }),
+    // we want this to allow undefined so that we can use the default value from the cache
+    // eslint-disable-next-line sf-plugin/flag-min-max-default
     wait: sf_plugins_core_1.Flags.duration({
         char: 'w',
         summary: messages.getMessage('flags.wait.summary'),
@@ -83,6 +88,16 @@ DeployMetadataResume.flags = {
         helpValue: '<minutes>',
         min: 1,
     }),
+    'coverage-formatters': sf_plugins_core_1.Flags.string({
+        multiple: true,
+        summary: messages.getMessage('flags.coverage-formatters.summary'),
+        options: types_1.reportsFormatters,
+    }),
+    junit: sf_plugins_core_1.Flags.boolean({ summary: messages.getMessage('flags.junit.summary') }),
+    'results-dir': sf_plugins_core_1.Flags.directory({
+        dependsOn: ['junit', 'coverage-formatters'],
+        summary: messages.getMessage('flags.results-dir.summary'),
+    }),
 };
 DeployMetadataResume.envVariablesSection = (0, sf_plugins_core_1.toHelpSection)('ENVIRONMENT VARIABLES', core_1.EnvironmentVariable.SF_USE_PROGRESS_BAR);
 DeployMetadataResume.errorCodes = (0, sf_plugins_core_1.toHelpSection)('ERROR CODES', errorCodes_1.DEPLOY_STATUS_CODES_DESCRIPTIONS);

package/lib/commands/project/deploy/resume.js.map

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

package/lib/commands/{deploy/metadata.d.ts → project/deploy/start.d.ts}

@@ -1,12 +1,13 @@
 import { SfError } from '@salesforce/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
-import { DeployResultJson, TestLevel } from '../../utils/types';
+import { DeployResultJson, TestLevel } from '../../../utils/types';
 export default class DeployMetadata extends SfCommand<DeployResultJson> {
     static readonly description: string;
     static readonly summary: string;
     static readonly examples: string[];
     static readonly requiresProject = true;
-    static readonly state = "beta";
+    static readonly aliases: string[];
+    static readonly deprecateAliases = true;
     static readonly flags: {
         'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         async: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
@@ -17,7 +18,7 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
         'ignore-warnings': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         manifest: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         metadata: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'metadata-dir': import("@oclif/core/lib/interfaces").OptionFlag<import("../../utils/types").PathInfo | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'metadata-dir': import("@oclif/core/lib/interfaces").OptionFlag<import("../../../utils/types").PathInfo | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'single-package': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'source-dir': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
@@ -25,6 +26,12 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
         'test-level': import("@oclif/core/lib/interfaces").OptionFlag<TestLevel, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         wait: import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/kit").Duration | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'purge-on-delete': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'pre-destructive-changes': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'post-destructive-changes': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'coverage-formatters': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        junit: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'results-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static configurationVariablesSection: import("@oclif/core").HelpSection;
     static envVariablesSection: import("@oclif/core").HelpSection;

package/lib/commands/{deploy/metadata.js → project/deploy/start.js}

@@ -10,35 +10,49 @@ const chalk_1 = require("chalk");
 const core_1 = require("@salesforce/core");
 const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const source_tracking_1 = require("@salesforce/source-tracking");
-const output_1 = require("../../utils/output");
-const progressBar_1 = require("../../utils/progressBar");
-const types_1 = require("../../utils/types");
-const deploy_1 = require("../../utils/deploy");
-const deployCache_1 = require("../../utils/deployCache");
-const errorCodes_1 = require("../../utils/errorCodes");
-const configMeta_1 = require("../../configMeta");
-const flags_1 = require("../../utils/flags");
-const conflicts_1 = require("../../utils/conflicts");
+const output_1 = require("../../../utils/output");
+const asyncDeployResultFormatter_1 = require("../../../formatters/asyncDeployResultFormatter");
+const deployResultFormatter_1 = require("../../../formatters/deployResultFormatter");
+const progressBar_1 = require("../../../utils/progressBar");
+const types_1 = require("../../../utils/types");
+const deploy_1 = require("../../../utils/deploy");
+const deployCache_1 = require("../../../utils/deployCache");
+const errorCodes_1 = require("../../../utils/errorCodes");
+const configMeta_1 = require("../../../configMeta");
+const flags_1 = require("../../../utils/flags");
+const conflicts_1 = require("../../../utils/conflicts");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata');
 const exclusiveFlags = ['manifest', 'source-dir', 'metadata', 'metadata-dir'];
 class DeployMetadata extends sf_plugins_core_1.SfCommand {
     async run() {
         const { flags } = await this.parse(DeployMetadata);
+        if (this.project.getSfProjectJson().getContents()['pushPackageDirectoriesSequentially'] &&
+            // flag exclusivity is handled correctly above - but to avoid short-circuiting the check, we need to check all of them
+            !flags.manifest &&
+            !flags.metadata &&
+            !flags['source-dir']) {
+            // if pushPackageDirectoriesSequentially = true, and they're not using any of the flags that would modify their deploy
+            // e.g. they're recreating a `source:push` command, which is the only one that respects this config value, warn them about it not working like it used to
+            this.warn(messages.getMessage('pushPackageDirsWarning'));
+        }
         if (!(0, deploy_1.validateTests)(flags['test-level'], flags.tests)) {
             throw messages.createError('error.NoTestsSpecified');
         }
-        const api = await (0, deploy_1.resolveApi)();
+        const api = await (0, deploy_1.resolveApi)(this.configAggregator);
         const { deploy, componentSet } = await (0, deploy_1.executeDeploy)({
             ...flags,
             'target-org': flags['target-org'].getUsername(),
             api,
-        }, this.project);
+        }, this.config.bin, this.project);
         const action = flags['dry-run'] ? 'Deploying (dry-run)' : 'Deploying';
         this.log((0, output_1.getVersionMessage)(action, componentSet, api));
         this.log(`Deploy ID: ${(0, chalk_1.bold)(deploy.id)}`);
         if (flags.async) {
-            const asyncFormatter = new output_1.AsyncDeployResultFormatter(deploy.id);
+            if (flags['coverage-formatters']) {
+                this.warn(messages.getMessage('asyncCoverageJunitWarning'));
+            }
+            const asyncFormatter = new asyncDeployResultFormatter_1.AsyncDeployResultFormatter(deploy.id, this.config.bin);
             if (!this.jsonEnabled())
                 asyncFormatter.display();
             return asyncFormatter.getJson();
@@ -46,7 +60,7 @@ class DeployMetadata extends sf_plugins_core_1.SfCommand {
         new progressBar_1.DeployProgress(deploy, this.jsonEnabled()).start();
         const result = await deploy.pollStatus({ timeout: flags.wait });
         process.exitCode = (0, deploy_1.determineExitCode)(result);
-        const formatter = new output_1.DeployResultFormatter(result, flags);
+        const formatter = new deployResultFormatter_1.DeployResultFormatter(result, flags);
         if (!this.jsonEnabled()) {
             formatter.display();
             if (flags['dry-run'])
@@ -63,12 +77,12 @@ class DeployMetadata extends sf_plugins_core_1.SfCommand {
                 return super.catch({
                     ...error,
                     message: messages.getMessage('error.Conflicts'),
-                    actions: messages.getMessages('error.Conflicts.Actions'),
+                    actions: messages.getMessages('error.Conflicts.Actions', [this.config.bin]),
                 });
             }
         }
         if (error.message.includes('client has timed out')) {
-            const err = messages.createError('error.ClientTimeout');
+            const err = messages.createError('error.ClientTimeout', [this.config.bin]);
             return super.catch({ ...error, name: err.name, message: err.message, code: err.code });
         }
         return super.catch(error);
@@ -79,7 +93,8 @@ DeployMetadata.description = messages.getMessage('description');
 DeployMetadata.summary = messages.getMessage('summary');
 DeployMetadata.examples = messages.getMessages('examples');
 DeployMetadata.requiresProject = true;
-DeployMetadata.state = 'beta';
+DeployMetadata.aliases = ['deploy:metadata'];
+DeployMetadata.deprecateAliases = true;
 DeployMetadata.flags = {
     'api-version': sf_plugins_core_1.Flags.orgApiVersion({
         char: 'a',
@@ -162,6 +177,7 @@ DeployMetadata.flags = {
         default: types_1.TestLevel.NoTestRun,
         description: messages.getMessage('flags.test-level.description'),
         summary: messages.getMessage('flags.test-level.summary'),
+        options: [types_1.TestLevel.NoTestRun, types_1.TestLevel.RunSpecifiedTests, types_1.TestLevel.RunLocalTests, types_1.TestLevel.RunAllTestsInOrg],
     }),
     verbose: sf_plugins_core_1.Flags.boolean({
         summary: messages.getMessage('flags.verbose.summary'),
@@ -177,8 +193,31 @@ DeployMetadata.flags = {
         min: 1,
         exclusive: ['async'],
     }),
+    'purge-on-delete': sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.purge-on-delete.summary'),
+        dependsOn: ['manifest'],
+        relationships: [{ type: 'some', flags: ['pre-destructive-changes', 'post-destructive-changes'] }],
+    }),
+    'pre-destructive-changes': sf_plugins_core_1.Flags.file({
+        summary: messages.getMessage('flags.pre-destructive-changes.summary'),
+        dependsOn: ['manifest'],
+    }),
+    'post-destructive-changes': sf_plugins_core_1.Flags.file({
+        summary: messages.getMessage('flags.post-destructive-changes.summary'),
+        dependsOn: ['manifest'],
+    }),
+    'coverage-formatters': sf_plugins_core_1.Flags.string({
+        multiple: true,
+        summary: messages.getMessage('flags.coverage-formatters.summary'),
+        options: types_1.reportsFormatters,
+    }),
+    junit: sf_plugins_core_1.Flags.boolean({ summary: messages.getMessage('flags.junit.summary'), dependsOn: ['coverage-formatters'] }),
+    'results-dir': sf_plugins_core_1.Flags.directory({
+        dependsOn: ['coverage-formatters'],
+        summary: messages.getMessage('flags.results-dir.summary'),
+    }),
 };
 DeployMetadata.configurationVariablesSection = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', core_1.OrgConfigProperties.TARGET_ORG, core_1.OrgConfigProperties.ORG_API_VERSION, configMeta_1.ConfigVars.ORG_METADATA_REST_DEPLOY);
 DeployMetadata.envVariablesSection = (0, sf_plugins_core_1.toHelpSection)('ENVIRONMENT VARIABLES', core_1.EnvironmentVariable.SF_TARGET_ORG, core_1.EnvironmentVariable.SF_USE_PROGRESS_BAR);
 DeployMetadata.errorCodes = (0, sf_plugins_core_1.toHelpSection)('ERROR CODES', errorCodes_1.DEPLOY_STATUS_CODES_DESCRIPTIONS);
-//# sourceMappingURL=metadata.js.map
+//# sourceMappingURL=start.js.map

package/lib/commands/project/deploy/start.js.map

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

package/lib/commands/{deploy/metadata → project/deploy}/validate.d.ts

@@ -5,7 +5,8 @@ export default class DeployMetadataValidate extends SfCommand<DeployResultJson>
     static readonly summary: string;
     static readonly examples: string[];
     static readonly requiresProject = true;
-    static readonly state = "beta";
+    static readonly aliases: string[];
+    static readonly deprecateAliases = true;
     static readonly flags: {
         'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         async: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;

package/lib/commands/{deploy/metadata → project/deploy}/validate.js

@@ -11,6 +11,8 @@ const core_1 = require("@salesforce/core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const output_1 = require("../../../utils/output");
+const asyncDeployResultFormatter_1 = require("../../../formatters/asyncDeployResultFormatter");
+const deployResultFormatter_1 = require("../../../formatters/deployResultFormatter");
 const progressBar_1 = require("../../../utils/progressBar");
 const types_1 = require("../../../utils/types");
 const deploy_1 = require("../../../utils/deploy");
@@ -22,35 +24,33 @@ const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retriev
 const EXACTLY_ONE_FLAGS = ['manifest', 'source-dir', 'metadata', 'metadata-dir'];
 class DeployMetadataValidate extends sf_plugins_core_1.SfCommand {
     async run() {
-        const { flags } = await this.parse(DeployMetadataValidate);
-        const api = await (0, deploy_1.resolveApi)();
+        const [{ flags }, api] = await Promise.all([this.parse(DeployMetadataValidate), (0, deploy_1.resolveApi)(this.configAggregator)]);
         const { deploy, componentSet } = await (0, deploy_1.executeDeploy)({
             ...flags,
             'ignore-conflicts': true,
             'dry-run': true,
             'target-org': flags['target-org'].getUsername(),
             api,
-        }, this.project);
+        }, this.config.bin, this.project);
         this.log((0, output_1.getVersionMessage)('Validating Deployment', componentSet, api));
         this.log(`Deploy ID: ${(0, chalk_1.bold)(deploy.id)}`);
-        new progressBar_1.DeployProgress(deploy, this.jsonEnabled()).start();
         if (flags.async) {
-            const asyncFormatter = new output_1.AsyncDeployResultFormatter(deploy.id);
+            const asyncFormatter = new asyncDeployResultFormatter_1.AsyncDeployResultFormatter(deploy.id, this.config.bin);
             if (!this.jsonEnabled())
                 asyncFormatter.display();
             return asyncFormatter.getJson();
         }
+        new progressBar_1.DeployProgress(deploy, this.jsonEnabled()).start();
         const result = await deploy.pollStatus(500, flags.wait?.seconds);
         process.exitCode = (0, deploy_1.determineExitCode)(result);
-        const formatter = new output_1.DeployResultFormatter(result, flags);
+        const formatter = new deployResultFormatter_1.DeployResultFormatter(result, flags);
         if (!this.jsonEnabled()) {
             formatter.display();
         }
         if (result.response.status === source_deploy_retrieve_1.RequestStatus.Succeeded) {
             this.log();
             this.logSuccess(messages.getMessage('info.SuccessfulValidation', [deploy.id]));
-            const suggestedCommand = `${this.config.bin} deploy metadata quick --job-id ${deploy.id}`;
-            this.log(`\nRun ${(0, chalk_1.bold)(suggestedCommand)} to execute this deploy.`);
+            this.log(messages.getMessage('info.suggestedQuickDeploy', [this.config.bin, deploy.id]));
         }
         else {
             throw messages.createError('error.FailedValidation', [deploy.id]);
@@ -63,7 +63,8 @@ DeployMetadataValidate.description = messages.getMessage('description');
 DeployMetadataValidate.summary = messages.getMessage('summary');
 DeployMetadataValidate.examples = messages.getMessages('examples');
 DeployMetadataValidate.requiresProject = true;
-DeployMetadataValidate.state = 'beta';
+DeployMetadataValidate.aliases = ['deploy:metadata:validate'];
+DeployMetadataValidate.deprecateAliases = true;
 DeployMetadataValidate.flags = {
     'api-version': sf_plugins_core_1.Flags.orgApiVersion({
         char: 'a',

package/lib/commands/project/deploy/validate.js.map

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