@salesforce/plugin-deploy-retrieve 1.1.2 → 1.2.1

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.2.1](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/v1.2.0...v1.2.1) (2022-03-31)
+
+### Bug Fixes
+
+- remove default value for tests ([#236](https://github.com/salesforcecli/plugin-deploy-retrieve/issues/236)) ([024d6b6](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/024d6b6af467ec16715a49438885ece7f0a911d1))
+
+## [1.2.0](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/v1.1.3...v1.2.0) (2022-03-23)
+
+### Features
+
+- deploy parity ([#219](https://github.com/salesforcecli/plugin-deploy-retrieve/issues/219)) ([9a3a1ce](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/9a3a1cedd58c2ac39de5770998d30bc33cb63c66)), closes [#221](https://github.com/salesforcecli/plugin-deploy-retrieve/issues/221) [#223](https://github.com/salesforcecli/plugin-deploy-retrieve/issues/223)
+
+### [1.1.3](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/v1.1.2...v1.1.3) (2022-03-16)
+
 ### [1.1.2](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/v1.1.1...v1.1.2) (2022-03-16)
 
 ### Bug Fixes

package/README.md

@@ -108,7 +108,7 @@ EXAMPLES
     $ sf deploy --interactive
 ```
 
-_See code: [src/commands/deploy.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/v1.1.1/src/commands/deploy.ts)_
+_See code: [src/commands/deploy.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/v1.2.0/src/commands/deploy.ts)_
 
 ## `sf deploy metadata`
 
@@ -116,17 +116,24 @@ Deploy metadata in source format to an org from your local project.
 
 ```
 USAGE
-  $ sf deploy metadata [--json] [-m <value> | -x <value> | -d <value>] [-o <value>] [-l
-    NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg] [-w <value>]
+  $ sf deploy metadata [--json] [-a <value>] [--dry-run] [-r] [-g] [-x <value>] [-m <value>] [-d <value>] [-o
+    <value>] [-t <value>] [-l NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg] [--verbose] [-w <value>]
 
 FLAGS
+  -a, --api-version=<value>    Target API version for the deploy.
   -d, --source-dir=<value>...  Path to the local source files to deploy.
+  -g, --ignore-warnings        Ignore warnings and allow a deployment to complete successfully.
   -l, --test-level=<option>    [default: NoTestRun] Deployment Apex testing level.
                                <options: NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg>
   -m, --metadata=<value>...    Metadata component names to deploy.
   -o, --target-org=<value>     Login username or alias for the target org.
-  -w, --wait=<value>           [default: 33] Number of minutes to wait for command to complete and display results.
+  -r, --ignore-errors          Ignore any errors and don’t roll back deployment.
+  -t, --tests=<value>...       Apex tests to run when --test-level is RunSpecifiedTests.
+  -w, --wait=<minutes>         [default: 33 minutes] Number of minutes to wait for command to complete and display
+                               results.
   -x, --manifest=<value>       Full file path for manifest (package.xml) of components to deploy.
+  --dry-run                    Validate deploy and run Apex tests but don’t save to the org.
+  --verbose                    Show verbose output of the deploy result.
 
 GLOBAL FLAGS
   --json  Format output as json.
@@ -182,6 +189,11 @@ EXAMPLES
     $ sf deploy metadata --metadata ApexClass --test-level RunLocalTests
 
 FLAG DESCRIPTIONS
+  -a, --api-version=<value>  Target API version for the deploy.
+
+    Use this flag to override the default API version, which is the latest version supported the CLI, with the API
+    version of your package.xml file.
+
   -d, --source-dir=<value>...  Path to the local source files to deploy.
 
     The supplied path can be to a single file (in which case the operation is applied to only one file) or to a folder
@@ -189,6 +201,11 @@ FLAG DESCRIPTIONS
 
     If you specify this flag, don’t specify --metadata or --manifest.
 
+  -g, --ignore-warnings  Ignore warnings and allow a deployment to complete successfully.
+
+    If a warning occurs and this flag is set to true, the success status of the deployment is set to true. When this
+    flag is set to false, success is set to false, and the warning is treated like an error.
+
   -l, --test-level=NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg  Deployment Apex testing level.
 
     Valid values are:
@@ -215,7 +232,18 @@ FLAG DESCRIPTIONS
 
     Overrides your default org.
 
-  -w, --wait=<value>  Number of minutes to wait for command to complete and display results.
+  -r, --ignore-errors  Ignore any errors and don’t roll back deployment.
+
+    When deploying to a production org, keep this flag set to false (default value). When set to true, components
+    without errors are deployed and components with errors are skipped, and could result in an inconsistent production
+    org.
+
+  -t, --tests=<value>...  Apex tests to run when --test-level is RunSpecifiedTests.
+
+    Separate multiple test names with commas, and enclose the entire flag value in double quotes if a test contains a
+    space.
+
+  -w, --wait=<minutes>  Number of minutes to wait for command to complete and display results.
 
     If the command continues to run after the wait period, the CLI returns control of the terminal window to you.
 
@@ -239,8 +267,8 @@ FLAGS
   -m, --metadata=<value>...      Metadata component names to retrieve.
   -n, --package-name=<value>...  Package names to retrieve.
   -o, --target-org=<value>       Login username or alias for the target org.
-  -w, --wait=<value>             [default: 33] Number of minutes to wait for the command to complete and display results
-                                 to the terminal window.
+  -w, --wait=<value>             [default: 33 minutes] Number of minutes to wait for the command to complete and display
+                                 results to the terminal window.
   -x, --manifest=<value>         File path for the manifest (package.xml) that specifies the components to retrieve.
 
 GLOBAL FLAGS

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

@@ -1,30 +1,32 @@
-import { FileResponse } from '@sf/sdr';
+import { FileResponse } from '@salesforce/source-deploy-retrieve';
 import { SfCommand } from '@salesforce/sf-plugins-core';
-export declare type TestResults = {
-    passing: number;
-    failing: number;
-    total: number;
-    time?: number;
-};
+import { TestLevel, TestResults } from '../../utils/types';
 export declare type DeployMetadataResult = {
     files: FileResponse[];
+    jobId: string;
     tests?: TestResults;
 };
 export default class DeployMetadata extends SfCommand<DeployMetadataResult> {
     static readonly description: string;
     static readonly summary: string;
     static readonly examples: string[];
+    static readonly requiresProject = true;
     static flags: {
-        metadata: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'ignore-errors': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'ignore-warnings': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         manifest: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        metadata: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
         'source-dir': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
-        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        'test-level': import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        wait: import("@oclif/core/lib/interfaces").OptionFlag<number>;
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org>;
+        tests: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
+        'test-level': import("@oclif/core/lib/interfaces").OptionFlag<TestLevel>;
+        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        wait: import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/kit").Duration>;
     };
     static configurationVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
     static envVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
     run(): Promise<DeployMetadataResult>;
     private setExitCode;
-    private getTestResults;
 }

package/lib/commands/deploy/metadata.js

@@ -1,123 +1,131 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /*
  * Copyright (c) 2021, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-const os_1 = require("os");
-const core_1 = require("@oclif/core");
-const core_2 = require("@salesforce/core");
-const kit_1 = require("@salesforce/kit");
-const ts_types_1 = require("@salesforce/ts-types");
-const types_1 = require("@sf/sdr/lib/src/client/types");
+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 orgs_1 = require("../../utils/orgs");
-const componentSetBuilder_1 = require("../../utils/componentSetBuilder");
 const output_1 = require("../../utils/output");
-const testLevel_1 = require("../../utils/testLevel");
 const progressBar_1 = require("../../utils/progressBar");
-const config_1 = require("../../utils/config");
-const requiredFlagValidator_1 = require("../../utils/requiredFlagValidator");
-core_2.Messages.importMessagesDirectory(__dirname);
-const messages = core_2.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata');
-// One of these flags must be specified for a valid deploy.
-const requiredFlags = ['manifest', 'metadata', 'source-dir'];
+const types_1 = require("../../utils/types");
+const deploy_1 = require("../../utils/deploy");
+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 {
     async run() {
-        const flags = (await this.parse(DeployMetadata)).flags;
-        const testLevel = flags['test-level'];
-        (0, requiredFlagValidator_1.validateOneOfCommandFlags)(requiredFlags, flags);
-        const componentSet = await componentSetBuilder_1.ComponentSetBuilder.build({
-            sourceapiversion: await (0, orgs_1.getSourceApiVersion)(),
-            sourcepath: flags['source-dir'],
-            manifest: (flags.manifest && {
-                manifestPath: flags.manifest,
-                directoryPaths: await (0, orgs_1.getPackageDirs)(),
-            }),
-            metadata: flags.metadata && {
-                metadataEntries: flags.metadata,
-                directoryPaths: await (0, orgs_1.getPackageDirs)(),
-            },
-        });
-        const targetOrg = await (0, orgs_1.resolveTargetOrg)(flags['target-org']);
-        this.log(`${os_1.EOL}${messages.getMessage('deploy.metadata.api', [targetOrg, (0, config_1.resolveRestDeploy)()])}${os_1.EOL}`);
-        const deploy = await componentSet.deploy({
-            usernameOrConnection: targetOrg,
-            apiOptions: { testLevel },
+        const { flags } = await this.parse(DeployMetadata);
+        if (!(0, deploy_1.validateTests)(flags['test-level'], flags.tests)) {
+            throw messages.createError('error.NoTestsSpecified');
+        }
+        const api = (0, deploy_1.resolveRestDeploy)();
+        const { deploy, componentSet } = await (0, deploy_1.executeDeploy)({
+            ...flags,
+            'target-org': flags['target-org'].getUsername(),
+            api,
         });
+        const action = flags['dry-run'] ? 'Deploying (dry-run)' : 'Deploying';
+        this.log((0, output_1.getVersionMessage)(action, componentSet, api));
+        this.log(`Deploy ID: ${deploy.id}`);
         new progressBar_1.DeployProgress(deploy, this.jsonEnabled()).start();
-        const result = await deploy.pollStatus(500, kit_1.Duration.minutes(flags.wait).seconds);
+        const result = await deploy.pollStatus(500, flags.wait.seconds);
         this.setExitCode(result);
         if (!this.jsonEnabled()) {
-            (0, output_1.displaySuccesses)(result);
-            (0, output_1.displayFailures)(result);
-            (0, output_1.displayTestResults)(result, testLevel);
+            (0, output_1.displayDeployResults)(result, flags['test-level'], flags.verbose);
+            if (flags['dry-run'])
+                this.log('Dry-run complete.');
         }
         return {
-            files: (0, output_1.asRelativePaths)((result === null || result === void 0 ? void 0 : result.getFileResponses()) || []),
-            tests: this.getTestResults(result),
+            jobId: result.response.id,
+            files: result.getFileResponses() || [],
+            tests: (0, deploy_1.getTestResults)(result),
         };
     }
     setExitCode(result) {
-        const status = (0, ts_types_1.getString)(result, 'response.status');
-        if (status !== types_1.RequestStatus.Succeeded) {
+        if (result.response.status !== source_deploy_retrieve_1.RequestStatus.Succeeded) {
             process.exitCode = 1;
         }
     }
-    getTestResults(result) {
-        const passing = (0, ts_types_1.get)(result, 'response.numberTestsCompleted', 0);
-        const failing = (0, ts_types_1.get)(result, 'response.numberTestErrors', 0);
-        const total = (0, ts_types_1.get)(result, 'response.numberTestsTotal', 0);
-        const testResults = { passing, failing, total };
-        const time = (0, ts_types_1.get)(result, 'response.details.runTestResult.totalTime', 0);
-        return time ? { ...testResults, time } : testResults;
-    }
 }
 exports.default = DeployMetadata;
 DeployMetadata.description = messages.getMessage('description');
 DeployMetadata.summary = messages.getMessage('summary');
 DeployMetadata.examples = messages.getMessages('examples');
+DeployMetadata.requiresProject = true;
 DeployMetadata.flags = {
-    metadata: core_1.Flags.string({
-        char: 'm',
-        summary: messages.getMessage('flags.metadata.summary'),
-        multiple: true,
-        exclusive: ['manifest', 'source-dir'],
+    'api-version': sf_plugins_core_1.Flags.orgApiVersion({
+        char: 'a',
+        summary: messages.getMessage('flags.api-version.summary'),
+        description: messages.getMessage('flags.api-version.description'),
+    }),
+    'dry-run': sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.dry-run.summary'),
+        default: false,
     }),
-    manifest: core_1.Flags.string({
+    'ignore-errors': sf_plugins_core_1.Flags.boolean({
+        char: 'r',
+        summary: messages.getMessage('flags.ignore-errors.summary'),
+        description: messages.getMessage('flags.ignore-errors.description'),
+        default: false,
+    }),
+    'ignore-warnings': sf_plugins_core_1.Flags.boolean({
+        char: 'g',
+        summary: messages.getMessage('flags.ignore-warnings.summary'),
+        description: messages.getMessage('flags.ignore-warnings.description'),
+        default: false,
+    }),
+    manifest: sf_plugins_core_1.Flags.file({
         char: 'x',
         description: messages.getMessage('flags.manifest.description'),
         summary: messages.getMessage('flags.manifest.summary'),
-        exclusive: ['metadata', 'source-dir'],
+        exactlyOne: ['manifest', 'source-dir', 'metadata'],
+        exists: true,
     }),
-    'source-dir': core_1.Flags.string({
+    metadata: sf_plugins_core_1.Flags.string({
+        char: 'm',
+        summary: messages.getMessage('flags.metadata.summary'),
+        multiple: true,
+        exactlyOne: ['manifest', 'source-dir', 'metadata'],
+    }),
+    'source-dir': sf_plugins_core_1.Flags.string({
         char: 'd',
         description: messages.getMessage('flags.source-dir.description'),
         summary: messages.getMessage('flags.source-dir.summary'),
         multiple: true,
-        exclusive: ['manifest', 'metadata'],
+        exactlyOne: ['manifest', 'source-dir', 'metadata'],
     }),
-    'target-org': core_1.Flags.string({
+    'target-org': sf_plugins_core_1.Flags.requiredOrg({
         char: 'o',
         description: messages.getMessage('flags.target-org.description'),
         summary: messages.getMessage('flags.target-org.summary'),
     }),
-    'test-level': core_1.Flags.string({
-        char: 'l',
+    tests: sf_plugins_core_1.Flags.string({
+        char: 't',
+        multiple: true,
+        summary: messages.getMessage('flags.tests.summary'),
+        description: messages.getMessage('flags.tests.description'),
+    }),
+    'test-level': (0, deploy_1.testLevelFlag)({
+        default: types_1.TestLevel.NoTestRun,
         description: messages.getMessage('flags.test-level.description'),
         summary: messages.getMessage('flags.test-level.summary'),
-        options: Object.values(testLevel_1.TestLevel),
-        default: testLevel_1.TestLevel.NoTestRun,
     }),
-    wait: core_1.Flags.integer({
+    verbose: sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.verbose.summary'),
+    }),
+    wait: sf_plugins_core_1.Flags.duration({
         char: 'w',
         summary: messages.getMessage('flags.wait.summary'),
         description: messages.getMessage('flags.wait.description'),
-        default: 33,
+        unit: 'minutes',
+        defaultValue: 33,
+        helpValue: '<minutes>',
+        min: 1,
     }),
 };
-DeployMetadata.configurationVariablesSection = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', core_2.OrgConfigProperties.TARGET_ORG, core_2.SfdxPropertyKeys.API_VERSION);
-DeployMetadata.envVariablesSection = (0, sf_plugins_core_1.toHelpSection)('ENVIRONMENT VARIABLES', core_2.EnvironmentVariable.SF_TARGET_ORG, core_2.EnvironmentVariable.SFDX_DEFAULTUSERNAME, core_2.EnvironmentVariable.SFDX_USE_PROGRESS_BAR);
+DeployMetadata.configurationVariablesSection = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', core_1.OrgConfigProperties.TARGET_ORG, core_1.SfdxPropertyKeys.API_VERSION);
+DeployMetadata.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/deploy/metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/commands/deploy/metadata.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,2BAAyB;AACzB,sCAAoC;AACpC,2CAAwG;AACxG,yCAA2C;AAC3C,mDAAsD;AAEtD,wDAA6D;AAC7D,iEAAuE;AACvE,2CAAyF;AACzF,yEAAsF;AACtF,+CAA4G;AAC5G,qDAAkD;AAClD,yDAAyD;AACzD,+CAAuD;AACvD,6EAA8E;AAE9E,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,iBAAiB,CAAC,CAAC;AAEhG,2DAA2D;AAC3D,MAAM,aAAa,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;AAc7D,MAAqB,cAAe,SAAQ,2BAA+B;IAwDlE,KAAK,CAAC,GAAG;QACd,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC;QACvD,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAc,CAAC;QACnD,IAAA,iDAAyB,EAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAEhD,MAAM,YAAY,GAAG,MAAM,yCAAmB,CAAC,KAAK,CAAC;YACnD,gBAAgB,EAAE,MAAM,IAAA,0BAAmB,GAAE;YAC7C,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC;YAC/B,QAAQ,EAAE,CAAC,KAAK,CAAC,QAAQ,IAAI;gBAC3B,YAAY,EAAE,KAAK,CAAC,QAAQ;gBAC5B,cAAc,EAAE,MAAM,IAAA,qBAAc,GAAE;aACvC,CAAmB;YACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI;gBAC1B,eAAe,EAAE,KAAK,CAAC,QAAQ;gBAC/B,cAAc,EAAE,MAAM,IAAA,qBAAc,GAAE;aACvC;SACF,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,MAAM,IAAA,uBAAgB,EAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QAE9D,IAAI,CAAC,GAAG,CAAC,GAAG,QAAG,GAAG,QAAQ,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC,SAAS,EAAE,IAAA,0BAAiB,GAAE,CAAC,CAAC,GAAG,QAAG,EAAE,CAAC,CAAC;QAExG,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC;YACvC,oBAAoB,EAAE,SAAS;YAC/B,UAAU,EAAE,EAAE,SAAS,EAAE;SAC1B,CAAC,CAAC;QAEH,IAAI,4BAAc,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAEvD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,cAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;QAClF,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAEzB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;YACvB,IAAA,yBAAgB,EAAC,MAAM,CAAC,CAAC;YACzB,IAAA,wBAAe,EAAC,MAAM,CAAC,CAAC;YACxB,IAAA,2BAAkB,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;SACvC;QACD,OAAO;YACL,KAAK,EAAE,IAAA,wBAAe,EAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,gBAAgB,EAAE,KAAI,EAAE,CAAC;YACxD,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;SACnC,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,MAAoB;QACtC,MAAM,MAAM,GAAG,IAAA,oBAAS,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;QACpD,IAAI,MAAM,KAAK,qBAAa,CAAC,SAAS,EAAE;YACtC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;SACtB;IACH,CAAC;IAEO,cAAc,CAAC,MAAoB;QACzC,MAAM,OAAO,GAAG,IAAA,cAAG,EAAC,MAAM,EAAE,+BAA+B,EAAE,CAAC,CAAW,CAAC;QAC1E,MAAM,OAAO,GAAG,IAAA,cAAG,EAAC,MAAM,EAAE,2BAA2B,EAAE,CAAC,CAAW,CAAC;QACtE,MAAM,KAAK,GAAG,IAAA,cAAG,EAAC,MAAM,EAAE,2BAA2B,EAAE,CAAC,CAAW,CAAC;QACpE,MAAM,WAAW,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,IAAA,cAAG,EAAC,MAAM,EAAE,0CAA0C,EAAE,CAAC,CAAW,CAAC;QAClF,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IACvD,CAAC;;AAjHH,iCAkHC;AAjHwB,0BAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,sBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,uBAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AACrD,oBAAK,GAAG;IACpB,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;QACtD,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,CAAC,UAAU,EAAE,YAAY,CAAC;KACtC,CAAC;IACF,QAAQ,EAAE,YAAK,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC;QAC9D,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;QACtD,SAAS,EAAE,CAAC,UAAU,EAAE,YAAY,CAAC;KACtC,CAAC;IACF,YAAY,EAAE,YAAK,CAAC,MAAM,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAChE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;QACxD,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC;KACpC,CAAC;IACF,YAAY,EAAE,YAAK,CAAC,MAAM,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAChE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;KACzD,CAAC;IACF,YAAY,EAAE,YAAK,CAAC,MAAM,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAChE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;QACxD,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAS,CAAC;QACjC,OAAO,EAAE,qBAAS,CAAC,SAAS;KAC7B,CAAC;IACF,IAAI,EAAE,YAAK,CAAC,OAAO,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;QAClD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;QAC1D,OAAO,EAAE,EAAE;KACZ,CAAC;CACH,CAAC;AAEY,4CAA6B,GAAG,IAAA,+BAAa,EACzD,yBAAyB,EACzB,0BAAmB,CAAC,UAAU,EAC9B,uBAAgB,CAAC,WAAW,CAC7B,CAAC;AACY,kCAAmB,GAAG,IAAA,+BAAa,EAC/C,uBAAuB,EACvB,0BAAmB,CAAC,aAAa,EACjC,0BAAmB,CAAC,oBAAoB,EACxC,0BAAmB,CAAC,qBAAqB,CAC1C,CAAC"}
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/commands/deploy/metadata.ts"],"names":[],"mappings":"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"}

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

@@ -1,18 +1,19 @@
-import { FileResponse, RetrieveResult } from '@sf/sdr';
+import { FileResponse, 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> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];
+    static readonly requiresProject = true;
     static flags: {
         'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string>;
         manifest: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         metadata: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
         'package-name': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
         'source-dir': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
-        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        wait: import("@oclif/core/lib/interfaces").OptionFlag<number>;
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org>;
+        wait: import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/kit").Duration>;
     };
     static configurationVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
     static envVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;

package/lib/commands/retrieve/metadata.js

@@ -1,50 +1,48 @@
 "use strict";
 /*
- * Copyright (c) 2021, salesforce.com, inc.
+ * 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 });
 const path = require("path");
-const core_1 = require("@oclif/core");
-const core_2 = require("@salesforce/core");
-const kit_1 = require("@salesforce/kit");
+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 ts_types_1 = require("@salesforce/ts-types");
-const orgs_1 = require("../../utils/orgs");
-const componentSetBuilder_1 = require("../../utils/componentSetBuilder");
 const output_1 = require("../../utils/output");
-const requiredFlagValidator_1 = require("../../utils/requiredFlagValidator");
-core_2.Messages.importMessagesDirectory(__dirname);
-const messages = core_2.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.metadata');
-const mdTrasferMessages = core_2.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer');
-// One of these flags must be specified for a valid deploy.
-const requiredFlags = ['manifest', 'metadata', 'package-name', 'source-dir'];
+const project_1 = require("../../utils/project");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.metadata');
+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;
-        (0, requiredFlagValidator_1.validateOneOfCommandFlags)(requiredFlags, flags);
-        const componentSet = await componentSetBuilder_1.ComponentSetBuilder.build({
+        this.spinner.start(messages.getMessage('spinner.start'));
+        const componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build({
             apiversion: flags['api-version'],
             sourcepath: flags['source-dir'],
             packagenames: flags['package-name'],
-            manifest: (flags.manifest && {
+            manifest: flags.manifest && {
                 manifestPath: flags.manifest,
-                directoryPaths: await (0, orgs_1.getPackageDirs)(),
-            }),
+                directoryPaths: await (0, project_1.getPackageDirs)(),
+            },
             metadata: flags.metadata && {
                 metadataEntries: flags.metadata,
-                directoryPaths: await (0, orgs_1.getPackageDirs)(),
+                directoryPaths: await (0, project_1.getPackageDirs)(),
             },
         });
-        const project = await core_2.SfdxProject.resolve();
+        this.spinner.status = messages.getMessage('spinner.sending', [
+            componentSet.sourceApiVersion || componentSet.apiVersion,
+        ]);
         const retrieve = await componentSet.retrieve({
-            usernameOrConnection: await (0, orgs_1.resolveTargetOrg)(flags['target-org']),
+            usernameOrConnection: flags['target-org'].getUsername(),
             merge: true,
-            output: project.getDefaultPackage().fullPath,
+            output: this.project.getDefaultPackage().fullPath,
             packageOptions: flags['package-name'],
         });
+        this.spinner.status = messages.getMessage('spinner.polling');
         retrieve.onUpdate((data) => {
             this.spinner.status = mdTrasferMessages.getMessage(data.status);
         });
@@ -55,30 +53,30 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
             this.spinner.stop(error.name);
             throw error;
         });
-        this.spinner.start(messages.getMessage('RetrieveTitle'));
         await retrieve.start();
-        const result = await retrieve.pollStatus(500, kit_1.Duration.minutes(flags.wait).seconds);
+        const result = await retrieve.pollStatus(500, flags.wait.seconds);
+        this.spinner.stop();
         const fileResponses = (result === null || result === void 0 ? void 0 : result.getFileResponses()) || [];
-        await this.displayResults(result, flags);
+        if (!this.jsonEnabled()) {
+            await this.displayResults(result, flags['package-name']);
+        }
         return fileResponses;
     }
-    async displayResults(result, flags) {
-        if (!(0, ts_types_1.getBoolean)(flags, 'json', false)) {
-            if (result.response.status === 'Succeeded') {
-                (0, output_1.displaySuccesses)(result);
-                (0, output_1.displayPackages)(result, await this.getPackages(result, flags));
-            }
-            else {
-                throw new core_2.SfdxError((0, ts_types_1.getString)(result.response, 'errorMessage', result.response.status), (0, ts_types_1.getString)(result.response, 'errorStatusCode', 'unknown'));
-            }
+    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, flags) {
+    async getPackages(result, packageNames = []) {
         const packages = [];
-        const projectPath = await core_2.SfdxProject.resolveProjectPath();
-        const packageNames = (0, ts_types_1.getArray)(flags, 'package-name', []);
+        const projectPath = await core_1.SfProject.resolveProjectPath();
         packageNames.forEach((name) => {
-            packages.push({ name, path: path.join(projectPath, name) });
+            const packagePath = path.join(projectPath, name);
+            packages.push({ name, path: packagePath, fullPath: path.resolve(packagePath) });
         });
         return packages;
     }
@@ -87,48 +85,51 @@ exports.default = RetrieveMetadata;
 RetrieveMetadata.summary = messages.getMessage('summary');
 RetrieveMetadata.description = messages.getMessage('description');
 RetrieveMetadata.examples = messages.getMessages('examples');
+RetrieveMetadata.requiresProject = true;
 RetrieveMetadata.flags = {
-    'api-version': core_1.Flags.string({
+    'api-version': sf_plugins_core_1.Flags.orgApiVersion({
         char: 'a',
         summary: messages.getMessage('flags.api-version.summary'),
         description: messages.getMessage('flags.api-version.description'),
     }),
-    manifest: core_1.Flags.string({
+    manifest: sf_plugins_core_1.Flags.file({
         char: 'x',
         summary: messages.getMessage('flags.manifest.summary'),
         description: messages.getMessage('flags.manifest.description'),
         exclusive: ['metadata', 'source-dir'],
+        exists: true,
     }),
-    metadata: core_1.Flags.string({
+    metadata: sf_plugins_core_1.Flags.string({
         char: 'm',
         summary: messages.getMessage('flags.metadata.summary'),
         multiple: true,
         exclusive: ['manifest', 'source-dir'],
     }),
-    'package-name': core_1.Flags.string({
+    'package-name': sf_plugins_core_1.Flags.string({
         char: 'n',
         summary: messages.getMessage('flags.package-name.summary'),
         multiple: true,
     }),
-    'source-dir': core_1.Flags.string({
+    'source-dir': sf_plugins_core_1.Flags.string({
         char: 'd',
         summary: messages.getMessage('flags.source-dir.summary'),
         description: messages.getMessage('flags.source-dir.description'),
         multiple: true,
         exclusive: ['manifest', 'metadata'],
     }),
-    'target-org': core_1.Flags.string({
+    'target-org': sf_plugins_core_1.Flags.requiredOrg({
         char: 'o',
         summary: messages.getMessage('flags.target-org.summary'),
         description: messages.getMessage('flags.target-org.description'),
     }),
-    wait: core_1.Flags.integer({
+    wait: sf_plugins_core_1.Flags.duration({
         char: 'w',
-        default: 33,
+        defaultValue: 33,
+        unit: 'minutes',
         summary: messages.getMessage('flags.wait.summary'),
         description: messages.getMessage('flags.wait.description'),
     }),
 };
-RetrieveMetadata.configurationVariablesSection = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', core_2.OrgConfigProperties.TARGET_ORG, core_2.SfdxPropertyKeys.API_VERSION);
-RetrieveMetadata.envVariablesSection = (0, sf_plugins_core_1.toHelpSection)('ENVIRONMENT VARIABLES', core_2.EnvironmentVariable.SF_TARGET_ORG, core_2.EnvironmentVariable.SFDX_DEFAULTUSERNAME, core_2.EnvironmentVariable.SFDX_USE_PROGRESS_BAR);
+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);
 //# sourceMappingURL=metadata.js.map