chore: merge main, resolve conflicts

CHANGELOG.md

@@ -1,3 +1,39 @@
+# [1.10.0](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/1.9.6...1.10.0) (2023-05-23)
+
+
+### Features
+
+* flag groups for deploy/retrieve ([#626](https://github.com/salesforcecli/plugin-deploy-retrieve/issues/626)) ([9438659](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/9438659d4c8d217b442da1fa63c151bad3bfacc5))
+
+
+
+## [1.9.6](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/1.9.5...1.9.6) (2023-05-20)
+
+
+### Bug Fixes
+
+* **deps:** bump tslib from 2.5.0 to 2.5.2 ([9ccb81c](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/9ccb81ccf38795fc89bff13e1e0d78f4136f46ae))
+
+
+
+## [1.9.5](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/1.9.4...1.9.5) (2023-05-19)
+
+
+### Bug Fixes
+
+* bump deps ([ed2cb6b](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/ed2cb6bd78eeb4a798d192534fea0d712b166605))
+
+
+
+## [1.9.4](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/1.9.3...1.9.4) (2023-05-19)
+
+
+### Bug Fixes
+
+* wrong flag name ([#622](https://github.com/salesforcecli/plugin-deploy-retrieve/issues/622)) ([9290bfc](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/9290bfcd88282cd3e940253d9eba7ad58dcca58b))
+
+
+
 ## [1.9.3](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/1.9.2...1.9.3) (2023-05-18)
 
 ### Bug Fixes

messages/deploy.metadata.md

@@ -86,7 +86,7 @@ Valid values are:
 
 - NoTestRun — No tests are run. This test level applies only to deployments to development environments, such as sandbox, Developer Edition, or trial orgs. This test level is the default for development environments.
 
-- RunSpecifiedTests — Runs only the tests that you specify with the --run-tests flag. Code coverage requirements differ from the default coverage requirements when using this test level. Executed tests must comprise a minimum of 75% code coverage for each class and trigger in the deployment package. This coverage is computed for each class and trigger individually and is different than the overall coverage percentage.
+- RunSpecifiedTests — Runs only the tests that you specify with the --tests flag. Code coverage requirements differ from the default coverage requirements when using this test level. Executed tests must comprise a minimum of 75% code coverage for each class and trigger in the deployment package. This coverage is computed for each class and trigger individually and is different than the overall coverage percentage.
 
 - RunLocalTests — All tests in your org are run, except the ones that originate from installed managed and unlocked packages. This test level is the default for production deployments that include Apex classes or triggers.
 

messages/deploy.metadata.validate.md

@@ -48,7 +48,7 @@ Deployment Apex testing level.
 
 Valid values are:
 
-- RunSpecifiedTests — Runs only the tests that you specify with the --run-tests flag. Code coverage requirements differ from the default coverage requirements when using this test level. Executed tests must comprise a minimum of 75% code coverage for each class and trigger in the deployment package. This coverage is computed for each class and trigger individually and is different than the overall coverage percentage.
+- RunSpecifiedTests — Runs only the tests that you specify with the --tests flag. Code coverage requirements differ from the default coverage requirements when using this test level. Executed tests must comprise a minimum of 75% code coverage for each class and trigger in the deployment package. This coverage is computed for each class and trigger individually and is different than the overall coverage percentage.
 
 - RunLocalTests — All tests in your org are run, except the ones that originate from installed managed and unlocked packages. This test level is the default.
 

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@salesforce/plugin-deploy-retrieve",
   "description": "deploy and retrieve commands for sf",
-  "version": "1.9.3",
+  "version": "1.10.0",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^2.8.5",
-    "@salesforce/apex-node": "^1.6.0",
+    "@salesforce/apex-node": "^1.6.1",
     "@salesforce/core": "^3.36.2",
     "@salesforce/kit": "^3.0.1",
-    "@salesforce/sf-plugins-core": "^2.4.2",
-    "@salesforce/source-deploy-retrieve": "^8.4.0",
+    "@salesforce/sf-plugins-core": "^2.4.3",
+    "@salesforce/source-deploy-retrieve": "^8.5.1",
     "@salesforce/source-tracking": "^3.1.5",
     "chalk": "^4.1.2",
     "fs-extra": "^10.0.1",
@@ -25,10 +25,10 @@
     "@salesforce/plugin-command-reference": "^2.4.4",
     "@salesforce/plugin-functions": "^1.21.6",
     "@salesforce/plugin-settings": "^1.4.2",
-    "@salesforce/plugin-source": "^2.10.4",
+    "@salesforce/plugin-source": "^2.10.10",
     "@salesforce/plugin-templates": "^55.4.10",
     "@salesforce/plugin-user": "^2.3.6",
-    "@salesforce/prettier-config": "^0.0.2",
+    "@salesforce/prettier-config": "^0.0.3",
     "@salesforce/source-testkit": "^2.0.59",
     "@salesforce/ts-sinon": "1.4.6",
     "@salesforce/ts-types": "^1.5.20",
@@ -39,7 +39,7 @@
     "@typescript-eslint/parser": "^5.55.0",
     "chai": "^4.3.7",
     "cross-env": "^7.0.3",
-    "eslint": "^8.40.0",
+    "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-config-salesforce": "^1.1.1",
     "eslint-config-salesforce-license": "^0.2.0",
@@ -49,7 +49,7 @@
     "eslint-plugin-jsdoc": "^39.9.1",
     "eslint-plugin-sf-plugin": "^1.15.2",
     "husky": "^7.0.4",
-    "jsforce": "^2.0.0-beta.21",
+    "jsforce": "^2.0.0-beta.23",
     "mocha": "^10.1.0",
     "nyc": "^15.1.0",
     "oclif": "^3.9.0",

src/commands/project/deploy/start.ts

@@ -25,6 +25,10 @@ Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata');
 
 const exclusiveFlags = ['manifest', 'source-dir', 'metadata', 'metadata-dir'];
+const mdapiFormatFlags = 'Metadata API Format';
+const sourceFormatFlags = 'Source Format';
+const testFlags = 'Test';
+const destructiveFlags = 'Delete';
 
 export default class DeployMetadata extends SfCommand<DeployResultJson> {
   public static readonly description = messages.getMessage('description');
@@ -76,40 +80,46 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
       summary: messages.getMessage('flags.manifest.summary'),
       exclusive: exclusiveFlags.filter((f) => f !== 'manifest'),
       exists: true,
+      helpGroup: sourceFormatFlags,
     }),
     metadata: Flags.string({
       char: 'm',
       summary: messages.getMessage('flags.metadata.summary'),
       multiple: true,
       exclusive: exclusiveFlags.filter((f) => f !== 'metadata'),
+      helpGroup: sourceFormatFlags,
     }),
     'metadata-dir': fileOrDirFlag({
       summary: messages.getMessage('flags.metadata-dir.summary'),
       exclusive: exclusiveFlags.filter((f) => f !== 'metadata-dir'),
       exists: true,
+      helpGroup: mdapiFormatFlags,
     }),
     'single-package': Flags.boolean({
       summary: messages.getMessage('flags.single-package.summary'),
       dependsOn: ['metadata-dir'],
+      helpGroup: mdapiFormatFlags,
     }),
     'source-dir': Flags.string({
       char: 'd',
       description: messages.getMessage('flags.source-dir.description'),
       summary: messages.getMessage('flags.source-dir.summary'),
       multiple: true,
       exclusive: exclusiveFlags.filter((f) => f !== 'source-dir'),
+      helpGroup: sourceFormatFlags,
     }),
     'target-org': Flags.requiredOrg({
       char: 'o',
       description: messages.getMessage('flags.target-org.description'),
       summary: messages.getMessage('flags.target-org.summary'),
       required: true,
     }),
-    tests: testsFlag,
+    tests: { ...testsFlag, helpGroup: testFlags },
     'test-level': testLevelFlag({
       description: messages.getMessage('flags.test-level.description'),
       summary: messages.getMessage('flags.test-level.summary'),
       options: [TestLevel.NoTestRun, TestLevel.RunSpecifiedTests, TestLevel.RunLocalTests, TestLevel.RunAllTestsInOrg],
+      helpGroup: testFlags,
     }),
     verbose: Flags.boolean({
       summary: messages.getMessage('flags.verbose.summary'),
@@ -129,20 +139,28 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
       summary: messages.getMessage('flags.purge-on-delete.summary'),
       dependsOn: ['manifest'],
       relationships: [{ type: 'some', flags: ['pre-destructive-changes', 'post-destructive-changes'] }],
+      helpGroup: destructiveFlags,
     }),
     'pre-destructive-changes': Flags.file({
       summary: messages.getMessage('flags.pre-destructive-changes.summary'),
       dependsOn: ['manifest'],
+      helpGroup: destructiveFlags,
     }),
     'post-destructive-changes': Flags.file({
       summary: messages.getMessage('flags.post-destructive-changes.summary'),
       dependsOn: ['manifest'],
+      helpGroup: destructiveFlags,
+    }),
+    'coverage-formatters': { ...coverageFormattersFlag, helpGroup: testFlags },
+    junit: Flags.boolean({
+      summary: messages.getMessage('flags.junit.summary'),
+      dependsOn: ['coverage-formatters'],
+      helpGroup: testFlags,
     }),
-    'coverage-formatters': coverageFormattersFlag,
-    junit: Flags.boolean({ summary: messages.getMessage('flags.junit.summary'), dependsOn: ['coverage-formatters'] }),
     'results-dir': Flags.directory({
       dependsOn: ['coverage-formatters'],
       summary: messages.getMessage('flags.results-dir.summary'),
+      helpGroup: testFlags,
     }),
   };
 

src/commands/project/retrieve/start.ts

@@ -36,6 +36,8 @@ const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 're
 const mdTransferMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer');
 
 type Format = 'source' | 'metadata';
+const mdapiFlagGroup = 'Metadata API Format';
+
 export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
@@ -83,6 +85,7 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
       summary: messages.getMessage('flags.single-package.summary'),
       dependsOn: ['target-metadata-dir'],
       exclusive: ['ignore-conflicts'],
+      helpGroup: mdapiFlagGroup,
     }),
     'source-dir': Flags.string({
       char: 'd',
@@ -101,6 +104,7 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
         },
       ],
       exclusive: ['ignore-conflicts'],
+      helpGroup: mdapiFlagGroup,
     }),
     'target-org': Flags.requiredOrg({
       char: 'o',
@@ -121,11 +125,13 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
       summary: messages.getMessage('flags.unzip.summary'),
       dependsOn: ['target-metadata-dir'],
       exclusive: ['ignore-conflicts'],
+      helpGroup: mdapiFlagGroup,
     }),
     'zip-file-name': zipFileFlag({
       summary: messages.getMessage('flags.zip-file-name.summary'),
       dependsOn: ['target-metadata-dir'],
       exclusive: ['ignore-conflicts'],
+      helpGroup: mdapiFlagGroup,
     }),
   };