@salesforce/plugin-deploy-retrieve 1.8.4 → 1.8.5-beta.2

package/lib/commands/project/delete/source.js

@@ -0,0 +1,423 @@
+"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 });
+exports.Source = void 0;
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+const core_1 = require("@salesforce/core");
+const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
+const kit_1 = require("@salesforce/kit");
+const source_tracking_1 = require("@salesforce/source-tracking");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const chalk = require("chalk");
+const types_1 = require("../../../utils/types");
+const project_1 = require("../../../utils/project");
+const deploy_1 = require("../../../utils/deploy");
+const output_1 = require("../../../utils/output");
+const progressBar_1 = require("../../../utils/progressBar");
+const deployCache_1 = require("../../../utils/deployCache");
+const fsPromises = fs.promises;
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'delete.source');
+const xorFlags = ['metadata', 'source-path'];
+class Source extends sf_plugins_core_1.SfCommand {
+    constructor() {
+        super(...arguments);
+        // private deleteResultFormatter: DeleteResultFormatter | DeployResultFormatter;
+        this.aborted = false;
+        // create the delete FileResponse as we're parsing the comp. set to use in the output
+        this.mixedDeployDelete = { delete: [], deploy: [] };
+        // map of component in project, to where it is stashed
+        this.stashPath = new Map();
+        this.tempDir = path.join(os.tmpdir(), 'source_delete');
+        /**
+         * Check if any conflicts exist in a specific component set.
+         * If conflicts exist, this will output the table and throw
+         */
+        this.filterConflictsByComponentSet = async () => {
+            const filteredConflicts = (await this.tracking?.getConflicts())?.filter((cr) => this.componentSet.has({ fullName: cr.name, type: cr.type })) ?? [];
+            this.processConflicts(filteredConflicts, messages.getMessage('conflictMsg'));
+            return filteredConflicts;
+        };
+        /**
+         * Write a table (if not json) and throw an error that includes a custom message and the conflict data
+         *
+         * @param conflicts
+         * @param message
+         */
+        this.processConflicts = (conflicts, message) => {
+            if (conflicts.length === 0) {
+                return;
+            }
+            this.table(conflicts, {
+                state: { header: 'STATE' },
+                fullName: { header: 'FULL NAME' },
+                type: { header: 'TYPE' },
+                filePath: { header: 'FILE PATH' },
+            });
+            // map do dedupe by name-type-filename
+            const conflictMap = new Map();
+            conflicts.forEach((c) => {
+                c.filenames?.forEach((f) => {
+                    conflictMap.set(`${c.name}#${c.type}#${f}`, {
+                        state: 'Conflict',
+                        fullName: c.name,
+                        type: c.type,
+                        filePath: path.resolve(f),
+                    });
+                });
+            });
+            const reformattedConflicts = Array.from(conflictMap.values());
+            const err = new core_1.SfError(message, 'sourceConflictDetected');
+            err.setData(reformattedConflicts);
+            throw err;
+        };
+    }
+    async run() {
+        this.flags = (await this.parse(Source)).flags;
+        this.org = this.flags['target-org'];
+        await this.preChecks();
+        await this.delete();
+        await this.resolveSuccess();
+        const result = this.formatResult();
+        // The DeleteResultFormatter will use SDR and scan the directory, if the files have been deleted, it will throw an error
+        // so we'll delete the files locally now
+        await this.deleteFilesLocally();
+        // makes sure files are deleted before updating tracking files
+        await this.maybeUpdateTracking();
+        return result;
+    }
+    async preChecks() {
+        if (this.flags['track-source']) {
+            this.tracking = await source_tracking_1.SourceTracking.create({ org: this.org, project: this.project });
+        }
+    }
+    async delete() {
+        const sourcepaths = this.flags['source-path'];
+        this.componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build({
+            apiversion: this.flags['api-version'],
+            sourceapiversion: await (0, project_1.getSourceApiVersion)(),
+            sourcepath: sourcepaths,
+            metadata: this.flags.metadata
+                ? {
+                    metadataEntries: this.flags.metadata,
+                    directoryPaths: await (0, project_1.getPackageDirs)(),
+                }
+                : undefined,
+        });
+        if (this.flags['track-source'] && !this.flags['force-overwrite']) {
+            await this.filterConflictsByComponentSet();
+        }
+        this.components = this.componentSet.toArray();
+        if (!this.components.length) {
+            // if we didn't find any components to delete, let the user know and exit
+            this.styledHeader(chalk.blue('Deleted Source'));
+            this.log('No results found');
+            return;
+        }
+        // create a new ComponentSet and mark everything for deletion
+        const cs = new source_deploy_retrieve_1.ComponentSet([]);
+        cs.apiVersion =
+            this.componentSet.apiVersion ?? this.flags['api-version'] ?? (await this.org.retrieveMaxApiVersion());
+        cs.sourceApiVersion =
+            this.componentSet.sourceApiVersion ?? this.flags['api-version'] ?? (await (0, project_1.getSourceApiVersion)());
+        this.components.map((component) => {
+            if (component instanceof source_deploy_retrieve_1.SourceComponent) {
+                cs.add(component, source_deploy_retrieve_1.DestructiveChangesType.POST);
+            }
+            else {
+                // a remote-only delete
+                cs.add(new source_deploy_retrieve_1.SourceComponent({ name: component.fullName, type: component.type }), source_deploy_retrieve_1.DestructiveChangesType.POST);
+            }
+        });
+        this.componentSet = cs;
+        if (sourcepaths) {
+            // determine if user is trying to delete a single file from a bundle, which is actually just an fs delete operation
+            // and then a constructive deploy on the "new" bundle
+            this.components
+                .filter((comp) => comp.type.strategies?.adapter === 'bundle')
+                .filter(types_1.isSourceComponent)
+                .map((bundle) => {
+                sourcepaths.map(async (sourcepath) => {
+                    // walkContent returns absolute paths while sourcepath will usually be relative
+                    if (bundle.walkContent().find((content) => content.endsWith(sourcepath))) {
+                        await this.moveBundleToManifest(bundle, sourcepath);
+                    }
+                });
+            });
+        }
+        this.aborted = !(await this.handlePrompt());
+        if (this.aborted)
+            return;
+        // fire predeploy event for the delete
+        await core_1.Lifecycle.getInstance().emit('predeploy', this.components);
+        this.isRest = (await (0, deploy_1.resolveApi)()) === 'REST';
+        this.log(`*** Deleting with ${this.isRest ? 'REST' : 'SOAP'} API ***`);
+        const deploy = await this.componentSet.deploy({
+            usernameOrConnection: this.org.getUsername(),
+            apiOptions: {
+                rest: this.isRest,
+                checkOnly: this.flags['check-only'] ?? false,
+                testLevel: this.flags['test-level'],
+            },
+        });
+        new progressBar_1.DeployProgress(deploy, this.jsonEnabled()).start();
+        this.deployResult = await deploy.pollStatus({ timeout: this.flags.wait });
+        await deployCache_1.DeployCache.update(deploy.id, { status: this.deployResult.response.status });
+        await core_1.Lifecycle.getInstance().emit('postdeploy', this.deployResult);
+        // result.getFileResponses() will crawl the tree, but that would throw after the delete occurs.
+        // Extract them here for updateTracking to use later
+        this.fileResponses = this.mixedDeployDelete.delete.length
+            ? this.mixedDeployDelete.delete
+            : this.deployResult.getFileResponses();
+    }
+    /**
+     * Checks the response status to determine whether the delete was successful.
+     */
+    async resolveSuccess() {
+        const status = this.deployResult?.response?.status;
+        if (status !== source_deploy_retrieve_1.RequestStatus.Succeeded && !this.aborted) {
+            process.exitCode = 1;
+        }
+        // if deploy failed OR the operation was cancelled, restore the stashed files if they exist
+        else if (status !== source_deploy_retrieve_1.RequestStatus.Succeeded || this.aborted) {
+            await Promise.all(this.mixedDeployDelete.delete.map(async (file) => {
+                await this.restoreFileFromStash(file.filePath);
+            }));
+        }
+        else if (this.mixedDeployDelete.delete.length) {
+            // successful delete -> delete the stashed file
+            await this.deleteStash();
+        }
+    }
+    formatResult() {
+        const formatterOptions = {
+            verbose: this.flags.verbose ?? false,
+        };
+        this.deleteResultFormatter = this.mixedDeployDelete.deploy.length
+            ? new output_1.DeployResultFormatter(this.deployResult, formatterOptions)
+            : new output_1.DeleteResultFormatter(this.deployResult);
+        // Only display results to console when JSON flag is unset.
+        if (!this.jsonEnabled()) {
+            this.deleteResultFormatter.display();
+        }
+        if (this.mixedDeployDelete.deploy.length && !this.aborted) {
+            // override JSON output when we actually deployed
+            const json = this.deleteResultFormatter.getJson();
+            json.deletedSource = this.mixedDeployDelete.delete; // to match toolbelt json output
+            json.outboundFiles = []; // to match toolbelt version
+            json.deletes = json.deploys; // to match toolbelt version
+            delete json.deploys;
+            return json;
+        }
+        if (this.aborted) {
+            return {
+                status: 0,
+                result: {
+                    deletedSource: [],
+                    deletes: [{}],
+                    outboundFiles: [],
+                },
+            };
+        }
+        return this.deleteResultFormatter.getJson();
+    }
+    async maybeUpdateTracking() {
+        if (this.flags['track-source'] ?? false) {
+            // might not exist if we exited from the operation early
+            if (!this.deployResult) {
+                return;
+            }
+            this.spinner.start('Updating source tracking');
+            const successes = (this.fileResponses ?? this.deployResult.getFileResponses()).filter((fileResponse) => fileResponse.state !== source_deploy_retrieve_1.ComponentStatus.Failed);
+            if (!successes.length) {
+                this.spinner.stop();
+                return;
+            }
+            await Promise.all([
+                this.tracking?.updateLocalTracking({
+                    files: successes
+                        .filter((fileResponse) => fileResponse.state !== source_deploy_retrieve_1.ComponentStatus.Deleted)
+                        .map((fileResponse) => fileResponse.filePath),
+                    deletedFiles: successes
+                        .filter((fileResponse) => fileResponse.state === source_deploy_retrieve_1.ComponentStatus.Deleted)
+                        .map((fileResponse) => fileResponse.filePath),
+                }),
+                this.tracking?.updateRemoteTracking(successes.map(({ state, fullName, type, filePath }) => ({ state, fullName, type, filePath }))),
+            ]);
+            this.spinner.stop();
+        }
+    }
+    async deleteFilesLocally() {
+        if (!this.flags['check-only'] && this.deployResult?.response?.status === source_deploy_retrieve_1.RequestStatus.Succeeded) {
+            const promises = [];
+            this.components?.filter(types_1.isSourceComponent).map((component) => {
+                // mixed delete/deploy operations have already been deleted and stashed
+                if (!this.mixedDeployDelete.delete.length) {
+                    if (component.content) {
+                        const stats = fs.statSync(component.content);
+                        if (stats.isDirectory()) {
+                            promises.push(fsPromises.rm(component.content, { recursive: true }));
+                        }
+                        else {
+                            promises.push(fsPromises.unlink(component.content));
+                        }
+                    }
+                    if (component.xml) {
+                        promises.push(fsPromises.unlink(component.xml));
+                    }
+                }
+            });
+            await Promise.all(promises);
+        }
+    }
+    async moveFileToStash(file) {
+        await fsPromises.mkdir(path.dirname(this.stashPath.get(file)), { recursive: true });
+        await fsPromises.copyFile(file, this.stashPath.get(file));
+        await fsPromises.unlink(file);
+    }
+    async restoreFileFromStash(file) {
+        await fsPromises.rename(this.stashPath.get(file), file);
+    }
+    async deleteStash() {
+        await fsPromises.rm(this.tempDir, { recursive: true, force: true });
+    }
+    async moveBundleToManifest(bundle, sourcepath) {
+        // if one of the passed in sourcepaths is to a bundle component
+        const fileName = path.basename(sourcepath);
+        const fullName = path.join(bundle.name, fileName);
+        this.mixedDeployDelete.delete.push({
+            state: source_deploy_retrieve_1.ComponentStatus.Deleted,
+            fullName,
+            type: bundle.type.name,
+            filePath: sourcepath,
+        });
+        // stash the file in case we need to restore it due to failed deploy/aborted command
+        this.stashPath.set(sourcepath, path.join(this.tempDir, fullName));
+        await this.moveFileToStash(sourcepath);
+        // re-walk the directory to avoid picking up the deleted file
+        this.mixedDeployDelete.deploy.push(...bundle.walkContent());
+        // now remove the bundle from destructive changes and add to manifest
+        // set the bundle as NOT marked for delete
+        this.componentSet.destructiveChangesPost.delete(`${bundle.type.id}#${bundle.fullName}`);
+        bundle.setMarkedForDelete(false);
+        this.componentSet.add(bundle);
+    }
+    async handlePrompt() {
+        if (!this.flags['no-prompt']) {
+            const remote = [];
+            let local = [];
+            const message = [];
+            this.components?.flatMap((component) => {
+                if (component instanceof source_deploy_retrieve_1.SourceComponent) {
+                    local.push(component.xml, ...component.walkContent());
+                }
+                else {
+                    // remote only metadata
+                    remote.push(`${component.type.name}:${component.fullName}`);
+                }
+            });
+            if (this.mixedDeployDelete.delete.length) {
+                local = this.mixedDeployDelete.delete.map((fr) => fr.fullName);
+            }
+            if (this.mixedDeployDelete.deploy.length) {
+                message.push(messages.getMessage('deployPrompt', [[...new Set(this.mixedDeployDelete.deploy)].join('\n')]));
+            }
+            if (remote.length) {
+                message.push(messages.getMessage('remotePrompt', [[...new Set(remote)].join('\n')]));
+            }
+            if (local.length) {
+                if (message.length) {
+                    // add a whitespace between remote and local
+                    message.push('\n');
+                }
+                message.push('\n', messages.getMessage('localPrompt', [[...new Set(local)].join('\n')]));
+            }
+            message.push(this.flags['check-only'] ?? false
+                ? messages.getMessage('areYouSureCheckOnly')
+                : messages.getMessage('areYouSure'));
+            return this.confirm(message.join('\n'));
+        }
+        return true;
+    }
+}
+exports.Source = Source;
+Source.summary = messages.getMessage('summary');
+Source.description = messages.getMessage('description');
+Source.examples = messages.getMessages('examples');
+Source.aliases = ['force:source:delete'];
+Source.deprecateAliases = true;
+Source.requiresProject = true;
+Source.flags = {
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    loglevel: sf_plugins_core_1.loglevel,
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'check-only': sf_plugins_core_1.Flags.boolean({
+        aliases: ['checkonly'],
+        deprecateAliases: true,
+        char: 'c',
+        description: messages.getMessage('flagsLong.check-only'),
+        summary: messages.getMessage('flags.check-only'),
+    }),
+    wait: sf_plugins_core_1.Flags.duration({
+        unit: 'minutes',
+        char: 'w',
+        default: kit_1.Duration.minutes(33),
+        min: 1,
+        description: messages.getMessage('flagsLong.wait'),
+        summary: messages.getMessage('flags.wait'),
+    }),
+    'test-level': sf_plugins_core_1.Flags.string({
+        char: 'l',
+        aliases: ['testlevel'],
+        deprecateAliases: true,
+        description: messages.getMessage('flagsLong.test-Level'),
+        summary: messages.getMessage('flags.test-Level'),
+        options: ['NoTestRun', 'RunLocalTests', 'RunAllTestsInOrg'],
+        default: 'NoTestRun',
+    }),
+    'no-prompt': sf_plugins_core_1.Flags.boolean({
+        char: 'r',
+        aliases: ['noprompt'],
+        deprecateAliases: true,
+        summary: messages.getMessage('flags.no-prompt'),
+    }),
+    metadata: (0, sf_plugins_core_1.arrayWithDeprecation)({
+        char: 'm',
+        description: messages.getMessage('flagsLong.metadata'),
+        summary: messages.getMessage('flags.metadata'),
+        exactlyOne: xorFlags,
+    }),
+    'source-path': (0, sf_plugins_core_1.arrayWithDeprecation)({
+        char: 'p',
+        aliases: ['sourcepath'],
+        deprecateAliases: true,
+        description: messages.getMessage('flagsLong.source-path'),
+        summary: messages.getMessage('flags.source-path'),
+        exactlyOne: xorFlags,
+    }),
+    'track-source': sf_plugins_core_1.Flags.boolean({
+        char: 't',
+        aliases: ['tracksource'],
+        deprecateAliases: true,
+        summary: messages.getMessage('flags.track-source'),
+        exclusive: ['check-only'],
+    }),
+    'force-overwrite': sf_plugins_core_1.Flags.boolean({
+        char: 'f',
+        aliases: ['forceoverwrite'],
+        deprecateAliases: true,
+        summary: messages.getMessage('flags.force-overwrite'),
+        dependsOn: ['track-source'],
+    }),
+    verbose: sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.verbose'),
+    }),
+};
+//# sourceMappingURL=source.js.map

package/lib/commands/project/delete/source.js.map

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

package/lib/commands/project/delete/tracking.d.ts

@@ -0,0 +1,19 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+export type DeleteTrackingResult = {
+    clearedFiles: string[];
+};
+export declare class DeleteTracking extends SfCommand<DeleteTrackingResult> {
+    static readonly deprecateAliases = true;
+    static readonly aliases: string[];
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly requiresProject = true;
+    static readonly examples: never[];
+    static readonly flags: {
+        '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>;
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'no-prompt': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<DeleteTrackingResult>;
+}

package/lib/commands/project/delete/tracking.js

@@ -0,0 +1,49 @@
+"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 });
+exports.DeleteTracking = void 0;
+const core_1 = require("@salesforce/core");
+const chalk = require("chalk");
+const source_tracking_1 = require("@salesforce/source-tracking");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'delete.tracking');
+class DeleteTracking extends sf_plugins_core_1.SfCommand {
+    async run() {
+        const { flags } = await this.parse(DeleteTracking);
+        let clearedFiles = [];
+        if (flags['no-prompt'] || (await this.confirm(chalk.dim(messages.getMessage('promptMessage'))))) {
+            const sourceTracking = await source_tracking_1.SourceTracking.create({
+                project: this.project,
+                org: flags['target-org'],
+            });
+            clearedFiles = await Promise.all([sourceTracking.clearLocalTracking(), sourceTracking.clearRemoteTracking()]);
+            this.logSuccess('Cleared local tracking files.');
+        }
+        return { clearedFiles };
+    }
+}
+exports.DeleteTracking = DeleteTracking;
+DeleteTracking.deprecateAliases = true;
+DeleteTracking.aliases = ['force:source:beta:tracking:clear', 'force:source:tracking:clear'];
+DeleteTracking.summary = messages.getMessage('deleteDescription');
+DeleteTracking.description = messages.getMessage('deleteDescription');
+DeleteTracking.requiresProject = true;
+DeleteTracking.examples = [];
+DeleteTracking.flags = {
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    loglevel: sf_plugins_core_1.loglevel,
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'no-prompt': sf_plugins_core_1.Flags.boolean({
+        char: 'p',
+        summary: messages.getMessage('no-promptDescription'),
+        aliases: ['noprompt'],
+        deprecateAliases: true,
+    }),
+};
+//# sourceMappingURL=tracking.js.map

package/lib/commands/project/delete/tracking.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracking.js","sourceRoot":"","sources":["../../../../src/commands/project/delete/tracking.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAA4C;AAC5C,+BAA+B;AAC/B,iEAA6D;AAC7D,iEAMqC;AAErC,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,iBAAiB,CAAC,CAAC;AAMhG,MAAa,cAAe,SAAQ,2BAA+B;IAoB1D,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAEnD,IAAI,YAAY,GAAa,EAAE,CAAC;QAChC,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/F,MAAM,cAAc,GAAG,MAAM,gCAAc,CAAC,MAAM,CAAC;gBACjD,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,GAAG,EAAE,KAAK,CAAC,YAAY,CAAC;aACzB,CAAC,CAAC;YACH,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC,kBAAkB,EAAE,EAAE,cAAc,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;YAC9G,IAAI,CAAC,UAAU,CAAC,+BAA+B,CAAC,CAAC;SAClD;QACD,OAAO,EAAE,YAAY,EAAE,CAAC;IAC1B,CAAC;;AAjCH,wCAkCC;AAjCwB,+BAAgB,GAAG,IAAI,CAAC;AACxB,sBAAO,GAAG,CAAC,kCAAkC,EAAE,6BAA6B,CAAC,CAAC;AAC9E,sBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;AACnD,0BAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;AACvD,8BAAe,GAAG,IAAI,CAAC;AACvB,uBAAQ,GAAG,EAAE,CAAC;AAEd,oBAAK,GAAG;IAC7B,aAAa,EAAE,mDAAiC;IAChD,QAAQ,EAAR,0BAAQ;IACR,YAAY,EAAE,iDAA+B;IAC7C,WAAW,EAAE,uBAAK,CAAC,OAAO,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;QACpD,OAAO,EAAE,CAAC,UAAU,CAAC;QACrB,gBAAgB,EAAE,IAAI;KACvB,CAAC;CACH,CAAC"}

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

@@ -7,6 +7,8 @@ export default class DeployMetadataCancel extends SfCommand<DeployResultJson> {
     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>;
         'job-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;

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

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 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");
@@ -16,10 +17,15 @@ core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata.cancel');
 class DeployMetadataCancel extends sf_plugins_core_1.SfCommand {
     async run() {
-        const { flags } = await this.parse(DeployMetadataCancel);
-        const cache = await deployCache_1.DeployCache.create();
+        const [{ flags }, cache] = await Promise.all([this.parse(DeployMetadataCancel), deployCache_1.DeployCache.create()]);
         const jobId = cache.resolveLatest(flags['use-most-recent'], flags['job-id']);
-        const deployOpts = cache.get(jobId);
+        // cancel don't care about your tracking conflicts
+        const deployOpts = { ...cache.get(jobId), 'ignore-conflicts': true };
+        // we may already know the job finished
+        if (deployOpts.status &&
+            [source_deploy_retrieve_1.RequestStatus.Canceled, source_deploy_retrieve_1.RequestStatus.Failed, source_deploy_retrieve_1.RequestStatus.Succeeded, source_deploy_retrieve_1.RequestStatus.SucceededPartial].includes(deployOpts.status)) {
+            messages.createError('error.CannotCancelDeployPre', [jobId, deployOpts.status]);
+        }
         if (flags.async) {
             const asyncResult = await (0, deploy_1.cancelDeployAsync)({ 'target-org': deployOpts['target-org'] }, jobId);
             const formatter = new output_1.AsyncDeployCancelResultFormatter(asyncResult.id);
@@ -52,6 +58,8 @@ DeployMetadataCancel.summary = messages.getMessage('summary');
 DeployMetadataCancel.examples = messages.getMessages('examples');
 DeployMetadataCancel.requiresProject = true;
 DeployMetadataCancel.state = 'beta';
+DeployMetadataCancel.aliases = ['deploy:metadata:cancel'];
+DeployMetadataCancel.deprecateAliases = true;
 DeployMetadataCancel.flags = {
     async: sf_plugins_core_1.Flags.boolean({
         summary: messages.getMessage('flags.async.summary'),
@@ -71,6 +79,8 @@ DeployMetadataCancel.flags = {
         summary: messages.getMessage('flags.use-most-recent.summary'),
         exactlyOne: ['use-most-recent', 'job-id'],
     }),
+    // we want to allow undefined to use the 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'),

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

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

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

@@ -6,8 +6,11 @@ export default class DeployMetadataPreview extends SfCommand<PreviewResult> {
     static readonly examples: string[];
     static readonly requiresProject = true;
     static readonly state = "beta";
+    static readonly aliases: string[];
+    static readonly deprecateAliases = true;
     static readonly flags: {
         'ignore-conflicts': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'only-ignored': 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>;
         'source-dir': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;