@salesforce/plugin-deploy-retrieve 1.2.1 → 1.4.1

package/lib/commands/deploy/metadata.js

@@ -6,13 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * 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 chalk_1 = require("chalk");
 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 progressBar_1 = require("../../utils/progressBar");
 const types_1 = require("../../utils/types");
 const deploy_1 = require("../../utils/deploy");
+const errorCodes_1 = require("../../utils/errorCodes");
+const configMeta_1 = require("../../configMeta");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata');
 class DeployMetadata extends sf_plugins_core_1.SfCommand {
@@ -21,7 +23,7 @@ class DeployMetadata extends sf_plugins_core_1.SfCommand {
         if (!(0, deploy_1.validateTests)(flags['test-level'], flags.tests)) {
             throw messages.createError('error.NoTestsSpecified');
         }
-        const api = (0, deploy_1.resolveRestDeploy)();
+        const api = await (0, deploy_1.resolveApi)();
         const { deploy, componentSet } = await (0, deploy_1.executeDeploy)({
             ...flags,
             'target-org': flags['target-org'].getUsername(),
@@ -29,25 +31,36 @@ class DeployMetadata extends sf_plugins_core_1.SfCommand {
         });
         const action = flags['dry-run'] ? 'Deploying (dry-run)' : 'Deploying';
         this.log((0, output_1.getVersionMessage)(action, componentSet, api));
-        this.log(`Deploy ID: ${deploy.id}`);
+        this.log(`Deploy ID: ${(0, chalk_1.bold)(deploy.id)}`);
+        if (flags.async) {
+            const asyncFormatter = new output_1.AsyncDeployResultFormatter(deploy.id);
+            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);
+        const result = await deploy.pollStatus({ timeout: flags.wait });
         this.setExitCode(result);
+        const formatter = new output_1.DeployResultFormatter(result, flags);
         if (!this.jsonEnabled()) {
-            (0, output_1.displayDeployResults)(result, flags['test-level'], flags.verbose);
+            formatter.display();
             if (flags['dry-run'])
-                this.log('Dry-run complete.');
+                this.logSuccess('Dry-run complete.');
+        }
+        if ((0, deploy_1.shouldRemoveFromCache)(result.response.status)) {
+            await deploy_1.DeployCache.unset(deploy.id);
         }
-        return {
-            jobId: result.response.id,
-            files: result.getFileResponses() || [],
-            tests: (0, deploy_1.getTestResults)(result),
-        };
+        return formatter.getJson();
     }
-    setExitCode(result) {
-        if (result.response.status !== source_deploy_retrieve_1.RequestStatus.Succeeded) {
-            process.exitCode = 1;
+    catch(error) {
+        if (error.message.includes('client has timed out')) {
+            const err = messages.createError('error.ClientTimeout');
+            return super.catch({ ...error, name: err.name, message: err.message, code: err.code });
         }
+        return super.catch(error);
+    }
+    setExitCode(result) {
+        process.exitCode = (0, deploy_1.determineExitCode)(result);
     }
 }
 exports.default = DeployMetadata;
@@ -55,12 +68,22 @@ DeployMetadata.description = messages.getMessage('description');
 DeployMetadata.summary = messages.getMessage('summary');
 DeployMetadata.examples = messages.getMessages('examples');
 DeployMetadata.requiresProject = true;
+DeployMetadata.state = 'beta';
 DeployMetadata.flags = {
     'api-version': sf_plugins_core_1.Flags.orgApiVersion({
         char: 'a',
         summary: messages.getMessage('flags.api-version.summary'),
         description: messages.getMessage('flags.api-version.description'),
     }),
+    async: sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.async.summary'),
+        description: messages.getMessage('flags.async.description'),
+        exclusive: ['wait'],
+    }),
+    concise: sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.concise.summary'),
+        exclusive: ['verbose'],
+    }),
     'dry-run': sf_plugins_core_1.Flags.boolean({
         summary: messages.getMessage('flags.dry-run.summary'),
         default: false,
@@ -115,6 +138,7 @@ DeployMetadata.flags = {
     }),
     verbose: sf_plugins_core_1.Flags.boolean({
         summary: messages.getMessage('flags.verbose.summary'),
+        exclusive: ['concise'],
     }),
     wait: sf_plugins_core_1.Flags.duration({
         char: 'w',
@@ -124,8 +148,10 @@ DeployMetadata.flags = {
         defaultValue: 33,
         helpValue: '<minutes>',
         min: 1,
+        exclusive: ['async'],
     }),
 };
-DeployMetadata.configurationVariablesSection = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', core_1.OrgConfigProperties.TARGET_ORG, core_1.SfdxPropertyKeys.API_VERSION);
+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

package/lib/commands/deploy/metadata.js.map

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

package/lib/commands/deploy.d.ts

@@ -1,3 +1,4 @@
+import { Hook } from '@oclif/core';
 import { Deployer, SfCommand } from '@salesforce/sf-plugins-core';
 export declare const DEPLOY_OPTIONS_FILE = "deploy-options.json";
 export default class Deploy extends SfCommand<void> {
@@ -19,4 +20,5 @@ export default class Deploy extends SfCommand<void> {
     shouldCommit(): Promise<boolean>;
     askToSave(): Promise<boolean>;
     selectDeployers(deployers: Deployer[]): Promise<Deployer[]>;
+    checkForHookFailures(hookResults: Hook.Result<Deployer[]>): void;
 }

package/lib/commands/deploy.js

@@ -29,6 +29,7 @@ class Deploy extends sf_plugins_core_1.SfCommand {
             this.log(`Using options found in ${exports.DEPLOY_OPTIONS_FILE}`);
         }
         const hookResults = await sf_plugins_core_1.SfHook.run(this.config, 'sf:deploy', options);
+        this.checkForHookFailures(hookResults);
         let deployers = hookResults.successes.flatMap((s) => s.result);
         if (deployers.length === 0) {
             this.log('Found nothing in the project to deploy');
@@ -137,6 +138,24 @@ class Deploy extends sf_plugins_core_1.SfCommand {
         }
         return final;
     }
+    checkForHookFailures(hookResults) {
+        var _a;
+        if ((_a = hookResults.failures) === null || _a === void 0 ? void 0 : _a.length) {
+            // display a table of the errors encountered; Plugin Name, Error Message
+            const columns = {
+                errorName: { header: 'Error Name' },
+                errorMessage: { header: 'Error Message' },
+            };
+            const failureData = hookResults.failures.map((failure) => {
+                return { errorName: failure.error.name, errorMessage: failure.error.message };
+            });
+            this.styledHeader(messages.getMessage('error.initialization.title'));
+            this.table(failureData, columns);
+            const err = messages.createError('error.initialization');
+            err.data = hookResults.failures;
+            throw err;
+        }
+    }
 }
 exports.default = Deploy;
 Deploy.summary = messages.getMessage('summary');

package/lib/commands/deploy.js.map

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

package/lib/commands/retrieve/metadata.d.ts

@@ -1,11 +1,12 @@
-import { FileResponse, RetrieveResult } from '@salesforce/source-deploy-retrieve';
+import { RetrieveResult } from '@salesforce/source-deploy-retrieve';
 import { SfCommand } from '@salesforce/sf-plugins-core';
-export declare type RetrieveMetadataResult = FileResponse[];
-export default class RetrieveMetadata extends SfCommand<RetrieveMetadataResult> {
+import { RetrieveResultJson } from '../../utils/types';
+export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];
     static readonly requiresProject = true;
+    static readonly state = "beta";
     static flags: {
         'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string>;
         manifest: import("@oclif/core/lib/interfaces").OptionFlag<string>;
@@ -18,7 +19,5 @@ export default class RetrieveMetadata extends SfCommand<RetrieveMetadataResult>
     static configurationVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
     static envVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
     protected retrieveResult: RetrieveResult;
-    run(): Promise<RetrieveMetadataResult>;
-    private displayResults;
-    private getPackages;
+    run(): Promise<RetrieveResultJson>;
 }

package/lib/commands/retrieve/metadata.js

@@ -6,7 +6,6 @@
  * 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 path = require("path");
 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");
@@ -18,7 +17,7 @@ const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retriev
 const mdTrasferMessages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer');
 class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
     async run() {
-        const flags = (await this.parse(RetrieveMetadata)).flags;
+        const { flags } = await this.parse(RetrieveMetadata);
         this.spinner.start(messages.getMessage('spinner.start'));
         const componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build({
             apiversion: flags['api-version'],
@@ -56,29 +55,16 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
         await retrieve.start();
         const result = await retrieve.pollStatus(500, flags.wait.seconds);
         this.spinner.stop();
-        const fileResponses = (result === null || result === void 0 ? void 0 : result.getFileResponses()) || [];
+        const formatter = new output_1.RetrieveResultFormatter(result, flags['package-name']);
         if (!this.jsonEnabled()) {
-            await this.displayResults(result, flags['package-name']);
+            if (result.response.status === 'Succeeded') {
+                await formatter.display();
+            }
+            else {
+                throw new core_1.SfError((0, ts_types_1.getString)(result.response, 'errorMessage', result.response.status), (0, ts_types_1.getString)(result.response, 'errorStatusCode', 'unknown'));
+            }
         }
-        return fileResponses;
-    }
-    async displayResults(result, packageNames = []) {
-        if (result.response.status === 'Succeeded') {
-            (0, output_1.displaySuccesses)(result);
-            (0, output_1.displayPackages)(result, await this.getPackages(result, packageNames));
-        }
-        else {
-            throw new core_1.SfError((0, ts_types_1.getString)(result.response, 'errorMessage', result.response.status), (0, ts_types_1.getString)(result.response, 'errorStatusCode', 'unknown'));
-        }
-    }
-    async getPackages(result, packageNames = []) {
-        const packages = [];
-        const projectPath = await core_1.SfProject.resolveProjectPath();
-        packageNames.forEach((name) => {
-            const packagePath = path.join(projectPath, name);
-            packages.push({ name, path: packagePath, fullPath: path.resolve(packagePath) });
-        });
-        return packages;
+        return formatter.getJson();
     }
 }
 exports.default = RetrieveMetadata;
@@ -86,6 +72,7 @@ RetrieveMetadata.summary = messages.getMessage('summary');
 RetrieveMetadata.description = messages.getMessage('description');
 RetrieveMetadata.examples = messages.getMessages('examples');
 RetrieveMetadata.requiresProject = true;
+RetrieveMetadata.state = 'beta';
 RetrieveMetadata.flags = {
     'api-version': sf_plugins_core_1.Flags.orgApiVersion({
         char: 'a',
@@ -130,6 +117,6 @@ RetrieveMetadata.flags = {
         description: messages.getMessage('flags.wait.description'),
     }),
 };
-RetrieveMetadata.configurationVariablesSection = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', core_1.OrgConfigProperties.TARGET_ORG, core_1.SfdxPropertyKeys.API_VERSION);
-RetrieveMetadata.envVariablesSection = (0, sf_plugins_core_1.toHelpSection)('ENVIRONMENT VARIABLES', core_1.EnvironmentVariable.SF_TARGET_ORG, core_1.EnvironmentVariable.SFDX_DEFAULTUSERNAME, core_1.EnvironmentVariable.SFDX_USE_PROGRESS_BAR);
+RetrieveMetadata.configurationVariablesSection = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', core_1.OrgConfigProperties.TARGET_ORG, core_1.OrgConfigProperties.ORG_API_VERSION);
+RetrieveMetadata.envVariablesSection = (0, sf_plugins_core_1.toHelpSection)('ENVIRONMENT VARIABLES', core_1.EnvironmentVariable.SF_TARGET_ORG, core_1.EnvironmentVariable.SF_USE_PROGRESS_BAR);
 //# sourceMappingURL=metadata.js.map

package/lib/commands/retrieve/metadata.js.map

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

package/lib/configMeta.d.ts

@@ -0,0 +1,17 @@
+import { ConfigValue } from '@salesforce/core';
+export declare enum ConfigVars {
+    /**
+     * Allow users to use the REST api for deployments.
+     */
+    ORG_METADATA_REST_DEPLOY = "org-metadata-rest-deploy"
+}
+declare const _default: {
+    key: ConfigVars;
+    description: string;
+    hidden: boolean;
+    input: {
+        validator: (value: ConfigValue) => boolean;
+        failedMessage: string;
+    };
+}[];
+export default _default;

package/lib/configMeta.js

@@ -0,0 +1,31 @@
+"use strict";
+/*
+ * Copyright (c) 2022, 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.ConfigVars = void 0;
+const core_1 = require("@salesforce/core");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'config');
+var ConfigVars;
+(function (ConfigVars) {
+    /**
+     * Allow users to use the REST api for deployments.
+     */
+    ConfigVars["ORG_METADATA_REST_DEPLOY"] = "org-metadata-rest-deploy";
+})(ConfigVars = exports.ConfigVars || (exports.ConfigVars = {}));
+exports.default = [
+    {
+        key: ConfigVars.ORG_METADATA_REST_DEPLOY,
+        description: messages.getMessage(ConfigVars.ORG_METADATA_REST_DEPLOY),
+        hidden: true,
+        input: {
+            validator: (value) => value != null && ['true', 'false'].includes(value.toString()),
+            failedMessage: messages.getMessage('error.invalidBooleanConfigValue'),
+        },
+    },
+];
+//# sourceMappingURL=configMeta.js.map

package/lib/configMeta.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configMeta.js","sourceRoot":"","sources":["../src/configMeta.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAAyD;AAEzD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,QAAQ,CAAC,CAAC;AAEvF,IAAY,UAKX;AALD,WAAY,UAAU;IACpB;;OAEG;IACH,mEAAqD,CAAA;AACvD,CAAC,EALW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAKrB;AAED,kBAAe;IACb;QACE,GAAG,EAAE,UAAU,CAAC,wBAAwB;QACxC,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,wBAAwB,CAAC;QACrE,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE;YACL,SAAS,EAAE,CAAC,KAAkB,EAAW,EAAE,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YACzG,aAAa,EAAE,QAAQ,CAAC,UAAU,CAAC,iCAAiC,CAAC;SACtE;KACF;CACF,CAAC"}

package/lib/utils/deploy.d.ts

@@ -1,12 +1,14 @@
 import { Interfaces } from '@oclif/core';
+import { Org, TTLConfig } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
 import { Nullable } from '@salesforce/ts-types';
-import { ComponentSet, DeployResult, MetadataApiDeploy } from '@salesforce/source-deploy-retrieve';
-import { API, TestLevel, TestResults } from './types';
-declare type Options = {
+import { ComponentSet, DeployResult, MetadataApiDeploy, RequestStatus } from '@salesforce/source-deploy-retrieve';
+import { API, TestLevel } from './types';
+export declare type DeployOptions = {
     api: API;
     'target-org': string;
     'test-level': TestLevel;
+    async?: boolean;
     'api-version'?: string;
     'dry-run'?: boolean;
     'ignore-errors'?: boolean;
@@ -17,13 +19,30 @@ declare type Options = {
     tests?: string[];
     wait?: Duration;
     verbose?: boolean;
+    concise?: boolean;
+};
+export declare type CachedOptions = Omit<DeployOptions, 'wait'> & {
+    wait: number;
 };
 export declare function validateTests(testLevel: TestLevel, tests: Nullable<string[]>): boolean;
-export declare function resolveRestDeploy(): API;
-export declare function executeDeploy(opts: Partial<Options>): Promise<{
+export declare function resolveApi(): Promise<API>;
+export declare function buildComponentSet(opts: Partial<DeployOptions>): Promise<ComponentSet>;
+export declare function executeDeploy(opts: Partial<DeployOptions>, id?: string): Promise<{
     deploy: MetadataApiDeploy;
     componentSet: ComponentSet;
 }>;
+export declare function cancelDeploy(opts: Partial<DeployOptions>, id: string): Promise<DeployResult>;
+export declare function cancelDeployAsync(opts: Partial<DeployOptions>, id: string): Promise<{
+    id: string;
+}>;
+export declare function poll(org: Org, id: string, wait: Duration, componentSet: ComponentSet): Promise<DeployResult>;
 export declare const testLevelFlag: (opts?: Partial<Interfaces.OptionFlag<TestLevel | undefined>>) => Interfaces.OptionFlag<TestLevel | undefined>;
-export declare function getTestResults(result: DeployResult): TestResults;
-export {};
+export declare function determineExitCode(result: DeployResult, async?: boolean): number;
+export declare function shouldRemoveFromCache(status: RequestStatus): boolean;
+export declare class DeployCache extends TTLConfig<TTLConfig.Options, CachedOptions> {
+    static getFileName(): string;
+    static getDefaultOptions(): TTLConfig.Options;
+    static set(key: string, value: Partial<CachedOptions>): Promise<void>;
+    static unset(key: string): Promise<void>;
+    resolveLatest(useMostRecent: boolean, key: Nullable<string>, throwOnNotFound?: boolean): string;
+}

package/lib/utils/deploy.js

@@ -6,33 +6,32 @@
  * 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.getTestResults = exports.testLevelFlag = exports.executeDeploy = exports.resolveRestDeploy = exports.validateTests = void 0;
+exports.DeployCache = exports.shouldRemoveFromCache = exports.determineExitCode = exports.testLevelFlag = exports.poll = exports.cancelDeployAsync = exports.cancelDeploy = exports.executeDeploy = exports.buildComponentSet = exports.resolveApi = exports.validateTests = void 0;
 const core_1 = require("@oclif/core");
 const core_2 = require("@salesforce/core");
+const kit_1 = require("@salesforce/kit");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
+const configMeta_1 = require("../configMeta");
 const project_1 = require("./project");
 const types_1 = require("./types");
+const errorCodes_1 = require("./errorCodes");
+core_2.Messages.importMessagesDirectory(__dirname);
+const messages = core_2.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'cache');
 function validateTests(testLevel, tests) {
     if (testLevel === types_1.TestLevel.RunSpecifiedTests && (tests !== null && tests !== void 0 ? tests : []).length === 0)
         return false;
     return true;
 }
 exports.validateTests = validateTests;
-function resolveRestDeploy() {
-    const restDeployConfig = core_2.ConfigAggregator.getValue(core_2.SfdxPropertyKeys.REST_DEPLOY).value;
-    if (restDeployConfig === 'false') {
-        return types_1.API.SOAP;
-    }
-    else if (restDeployConfig === 'true') {
-        return types_1.API.REST;
-    }
-    else {
-        return types_1.API.SOAP;
-    }
+async function resolveApi() {
+    var _a;
+    const agg = await core_2.ConfigAggregator.create({ customConfigMeta: configMeta_1.default });
+    const restDeployConfig = (_a = agg.getInfo(configMeta_1.ConfigVars.ORG_METADATA_REST_DEPLOY)) === null || _a === void 0 ? void 0 : _a.value;
+    return restDeployConfig === 'true' ? types_1.API.REST : types_1.API.SOAP;
 }
-exports.resolveRestDeploy = resolveRestDeploy;
-async function executeDeploy(opts) {
-    const componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build({
+exports.resolveApi = resolveApi;
+async function buildComponentSet(opts) {
+    return source_deploy_retrieve_1.ComponentSetBuilder.build({
         apiversion: opts['api-version'],
         sourceapiversion: await (0, project_1.getSourceApiVersion)(),
         sourcepath: opts['source-dir'],
@@ -45,8 +44,14 @@ async function executeDeploy(opts) {
             directoryPaths: await (0, project_1.getPackageDirs)(),
         },
     });
+}
+exports.buildComponentSet = buildComponentSet;
+async function executeDeploy(opts, id) {
+    var _a, _b;
+    const componentSet = await buildComponentSet(opts);
     const deploy = await componentSet.deploy({
         usernameOrConnection: opts['target-org'],
+        id,
         apiOptions: {
             checkOnly: opts['dry-run'] || false,
             ignoreWarnings: opts['ignore-warnings'] || false,
@@ -56,9 +61,52 @@ async function executeDeploy(opts) {
             testLevel: opts['test-level'],
         },
     });
+    await DeployCache.set(deploy.id, { ...opts, wait: (_b = (_a = opts.wait) === null || _a === void 0 ? void 0 : _a.minutes) !== null && _b !== void 0 ? _b : 33 });
     return { deploy, componentSet };
 }
 exports.executeDeploy = executeDeploy;
+async function cancelDeploy(opts, id) {
+    var _a, _b;
+    const org = await core_2.Org.create({ aliasOrUsername: opts['target-org'] });
+    const deploy = new source_deploy_retrieve_1.MetadataApiDeploy({ usernameOrConnection: org.getUsername(), id });
+    const componentSet = await buildComponentSet({ ...opts });
+    await DeployCache.set(deploy.id, { ...opts, wait: (_b = (_a = opts.wait) === null || _a === void 0 ? void 0 : _a.minutes) !== null && _b !== void 0 ? _b : 33 });
+    await deploy.cancel();
+    return poll(org, deploy.id, opts.wait, componentSet);
+}
+exports.cancelDeploy = cancelDeploy;
+async function cancelDeployAsync(opts, id) {
+    const org = await core_2.Org.create({ aliasOrUsername: opts['target-org'] });
+    const deploy = new source_deploy_retrieve_1.MetadataApiDeploy({ usernameOrConnection: org.getUsername(), id });
+    await deploy.cancel();
+    return { id: deploy.id };
+}
+exports.cancelDeployAsync = cancelDeployAsync;
+async function poll(org, id, wait, componentSet) {
+    const report = async () => {
+        const res = await org.getConnection().metadata.checkDeployStatus(id, true);
+        const deployStatus = res;
+        return new source_deploy_retrieve_1.DeployResult(deployStatus, componentSet);
+    };
+    const opts = {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        frequency: kit_1.Duration.milliseconds(1000),
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        timeout: wait,
+        poll: async () => {
+            const deployResult = await report();
+            return {
+                completed: deployResult.response.done,
+                payload: deployResult,
+            };
+        },
+    };
+    const pollingClient = await core_2.PollingClient.create(opts);
+    return pollingClient.subscribe();
+}
+exports.poll = poll;
 const testLevelFlag = (opts = {}) => {
     return core_1.Flags.build({
         char: 'l',
@@ -68,14 +116,56 @@ const testLevelFlag = (opts = {}) => {
     })();
 };
 exports.testLevelFlag = testLevelFlag;
-function getTestResults(result) {
-    var _a, _b, _c;
-    const passing = (_a = result.response.numberTestsCompleted) !== null && _a !== void 0 ? _a : 0;
-    const failing = (_b = result.response.numberTestErrors) !== null && _b !== void 0 ? _b : 0;
-    const total = (_c = result.response.numberTestsTotal) !== null && _c !== void 0 ? _c : 0;
-    const testResults = { passing, failing, total };
-    const time = result.response.details.runTestResult.totalTime;
-    return time ? { ...testResults, time } : testResults;
+function determineExitCode(result, async = false) {
+    if (async) {
+        return result.response.status === source_deploy_retrieve_1.RequestStatus.Succeeded ? 0 : 1;
+    }
+    return errorCodes_1.DEPLOY_STATUS_CODES.get(result.response.status);
+}
+exports.determineExitCode = determineExitCode;
+function shouldRemoveFromCache(status) {
+    return [
+        source_deploy_retrieve_1.RequestStatus.Succeeded,
+        source_deploy_retrieve_1.RequestStatus.Failed,
+        source_deploy_retrieve_1.RequestStatus.SucceededPartial,
+        source_deploy_retrieve_1.RequestStatus.Canceled,
+    ].includes(status);
+}
+exports.shouldRemoveFromCache = shouldRemoveFromCache;
+class DeployCache extends core_2.TTLConfig {
+    static getFileName() {
+        return 'deploy-cache.json';
+    }
+    static getDefaultOptions() {
+        return {
+            isGlobal: false,
+            isState: true,
+            filename: DeployCache.getFileName(),
+            stateFolder: core_2.Global.SF_STATE_FOLDER,
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            ttl: kit_1.Duration.days(3),
+        };
+    }
+    static async set(key, value) {
+        const cache = await DeployCache.create();
+        cache.set(key, value);
+        await cache.write();
+    }
+    static async unset(key) {
+        const cache = await DeployCache.create();
+        cache.unset(key);
+        await cache.write();
+    }
+    resolveLatest(useMostRecent, key, throwOnNotFound = true) {
+        const jobId = useMostRecent ? this.getLatestKey() : key;
+        if (!jobId && useMostRecent)
+            throw messages.createError('error.NoRecentJobId');
+        if (throwOnNotFound && !this.has(jobId)) {
+            throw messages.createError('error.InvalidJobId', [jobId]);
+        }
+        return jobId;
+    }
 }
-exports.getTestResults = getTestResults;
+exports.DeployCache = DeployCache;
 //# sourceMappingURL=deploy.js.map