Merge branch 'main' into cd/mso-test-failure

Author: mdonnalley

CHANGELOG.md

@@ -1,3 +1,45 @@
+## [3.15.22](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.15.21...3.15.22) (2024-12-14)
+
+### Bug Fixes
+
+- **deps:** bump @oclif/core from 4.0.34 to 4.0.37 ([75c0f0b](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/75c0f0b980dfb0b06aed2285855a5f0d007c8031))
+
+## [3.15.21](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.15.20...3.15.21) (2024-12-14)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/sf-plugins-core from 12.0.11 to 12.1.1 ([7dea591](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/7dea59160acc64f2111e6eadc16285e53248fa61))
+
+## [3.15.20](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.15.19...3.15.20) (2024-12-07)
+
+### Bug Fixes
+
+- **deps:** bump @oclif/core from 4.0.33 to 4.0.34 ([008a906](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/008a9069488c33b606fde1b778be63339bf271dc))
+
+## [3.15.19](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.15.18...3.15.19) (2024-12-07)
+
+### Bug Fixes
+
+- **deps:** bump @oclif/multi-stage-output from 0.7.12 to 0.7.15 ([254a567](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/254a56769ba2fc73c5716de17449e9361fbabbfe))
+
+## [3.15.18](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.15.17...3.15.18) (2024-12-06)
+
+### Bug Fixes
+
+- no ENOENT when nothing retrieved to specific directory ([62e9cfa](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/62e9cfa21e5dada4dc2541fd0245761fa312d701))
+
+## [3.15.17](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.15.16...3.15.17) (2024-11-30)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/source-deploy-retrieve ([71f7918](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/71f7918d098e910d4ded55cbacecc6cc2d42ccfb))
+
+## [3.15.16](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.15.15...3.15.16) (2024-11-30)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/plugin-info from 3.4.21 to 3.4.23 ([84e9931](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/84e9931e5319cd7e8b4b9d6f71eb2233a6a10712))
+
 ## [3.15.15](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.15.14...3.15.15) (2024-11-23)
 
 ### Bug Fixes

README.md

@@ -141,7 +141,7 @@ FLAG DESCRIPTIONS
     If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/convert/mdapi.ts)_
+_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/convert/mdapi.ts)_
 
 ## `sf project convert source`
 
@@ -214,7 +214,7 @@ FLAG DESCRIPTIONS
     Override the api version used for api requests made by this command
 ```
 
-_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/convert/source.ts)_
+_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/convert/source.ts)_
 
 ## `sf project convert source-behavior`
 
@@ -272,7 +272,7 @@ EXAMPLES
     $ sf project convert source-behavior --behavior decomposePermissionSetBeta --dry-run --preserve-temp-dir
 ```
 
-_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/convert/source-behavior.ts)_
+_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/convert/source-behavior.ts)_
 
 ## `sf project delete source`
 
@@ -412,7 +412,7 @@ FLAG DESCRIPTIONS
     - Separate the test names with spaces: --tests Test1 Test2 "Test With Space"
 ```
 
-_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/delete/source.ts)_
+_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/delete/source.ts)_
 
 ## `sf project delete tracking`
 
@@ -449,7 +449,7 @@ EXAMPLES
     $ sf project delete tracking --target-org my-scratch
 ```
 
-_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/delete/tracking.ts)_
+_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/delete/tracking.ts)_
 
 ## `sf project deploy cancel`
 
@@ -521,7 +521,7 @@ FLAG DESCRIPTIONS
     project deploy report".
 ```
 
-_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/deploy/cancel.ts)_
+_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/deploy/cancel.ts)_
 
 ## `sf project deploy preview`
 
@@ -604,7 +604,7 @@ FLAG DESCRIPTIONS
     All child components are included. If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/deploy/preview.ts)_
+_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/deploy/preview.ts)_
 
 ## `sf project deploy quick`
 
@@ -688,7 +688,7 @@ FLAG DESCRIPTIONS
     deploy report".
 ```
 
-_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/deploy/quick.ts)_
+_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/deploy/quick.ts)_
 
 ## `sf project deploy report`
 
@@ -780,7 +780,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/deploy/report.ts)_
+_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/deploy/report.ts)_
 
 ## `sf project deploy resume`
 
@@ -865,7 +865,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/deploy/resume.ts)_
+_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/deploy/resume.ts)_
 
 ## `sf project deploy start`
 
@@ -1101,7 +1101,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/deploy/start.ts)_
+_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/deploy/start.ts)_
 
 ## `sf project deploy validate`
 
@@ -1274,7 +1274,7 @@ FLAG DESCRIPTIONS
     --coverage-formatters lcov --coverage-formatters clover
 ```
 
-_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/deploy/validate.ts)_
+_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/deploy/validate.ts)_
 
 ## `sf project generate manifest`
 
@@ -1351,7 +1351,7 @@ EXAMPLES
     $ sf project generate manifest --from-org [email protected] --include-packages unlocked
 ```
 
-_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/generate/manifest.ts)_
+_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/generate/manifest.ts)_
 
 ## `sf project list ignored`
 
@@ -1393,7 +1393,7 @@ EXAMPLES
     $ sf project list ignored --source-dir package.xml
 ```
 
-_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/list/ignored.ts)_
+_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/list/ignored.ts)_
 
 ## `sf project reset tracking`
 
@@ -1442,7 +1442,7 @@ EXAMPLES
     $ sf project reset tracking --revision 30
 ```
 
-_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/reset/tracking.ts)_
+_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/reset/tracking.ts)_
 
 ## `sf project retrieve preview`
 
@@ -1496,7 +1496,7 @@ FLAG DESCRIPTIONS
     production orgs.
 ```
 
-_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/retrieve/preview.ts)_
+_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/retrieve/preview.ts)_
 
 ## `sf project retrieve start`
 
@@ -1665,6 +1665,6 @@ FLAG DESCRIPTIONS
     If you specify this flag, don’t specify --metadata or --source-dir.
 ```
 
-_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.15/src/commands/project/retrieve/start.ts)_
+_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.15.22/src/commands/project/retrieve/start.ts)_
 
 <!-- commandsstop -->

package.json

@@ -1,34 +1,34 @@
 {
   "name": "@salesforce/plugin-deploy-retrieve",
   "description": "deploy and retrieve commands for sf",
-  "version": "3.15.15",
+  "version": "3.15.22",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
-    "@oclif/core": "^4.0.28",
+    "@oclif/core": "^4.0.37",
     "@oclif/multi-stage-output": "^0.8.0",
     "@salesforce/apex-node": "^8.1.18",
     "@salesforce/core": "^8.6.4",
     "@salesforce/kit": "^3.2.3",
-    "@salesforce/plugin-info": "^3.4.21",
-    "@salesforce/sf-plugins-core": "^12.0.11",
-    "@salesforce/source-deploy-retrieve": "^12.10.1",
+    "@salesforce/plugin-info": "^3.4.23",
+    "@salesforce/sf-plugins-core": "^12.1.1",
+    "@salesforce/source-deploy-retrieve": "^12.10.2",
     "@salesforce/source-tracking": "^7.1.17",
     "@salesforce/ts-types": "^2.0.12",
     "ansis": "^3.3.2",
     "terminal-link": "^3.0.0"
   },
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^5.2.17",
+    "@oclif/plugin-command-snapshot": "^5.2.22",
     "@salesforce/cli-plugins-testkit": "^5.3.38",
     "@salesforce/dev-scripts": "^10.2.11",
-    "@salesforce/plugin-command-reference": "^3.1.34",
+    "@salesforce/plugin-command-reference": "^3.1.37",
     "@salesforce/schemas": "^1.9.0",
-    "@salesforce/source-testkit": "^2.2.88",
-    "@salesforce/ts-sinon": "^1.4.28",
+    "@salesforce/source-testkit": "^2.2.90",
+    "@salesforce/ts-sinon": "^1.4.30",
     "cross-env": "^7.0.3",
     "eslint-plugin-sf-plugin": "^1.20.13",
-    "oclif": "^4.15.28",
+    "oclif": "^4.16.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   },

src/commands/project/retrieve/start.ts

@@ -354,6 +354,11 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
       );
       return directories;
     }
+    // If we retrieved only a package.xml, just return.
+    if (this.retrieveResult.getFileResponses().length < 2) {
+      return;
+    }
+
     // getFileResponses fails once the files have been moved, calculate where they're moved to, and then move them
     this.retrieveResult.getFileResponses().forEach((fileResponse) => {
       fileResponse.filePath = fileResponse.filePath?.replace(join('main', 'default'), '');

test/nuts/retrieve/metadata.nut.ts

@@ -83,6 +83,20 @@ describe('retrieve metadata NUTs', () => {
       await testkit.expect.filesToBeRetrieved(['myOutput/classes/*', 'myOutput/aura/**/*']);
     });
 
+    it('should warn when nothing retrieved into output-dir and not throw ENOENT', async () => {
+      const result = await testkit.retrieve({ args: '--metadata ApexClass:NonExistant --output-dir myOutput' });
+      expect(result?.status).to.equal(0);
+      const retrieveResult = result?.result as unknown as RetrieveResultJson;
+      expect(retrieveResult.success).to.equal(true);
+      expect(retrieveResult.fileProperties).to.be.an('array').with.lengthOf(1);
+      expect(retrieveResult.messages).to.deep.equal([
+        {
+          fileName: 'unpackaged/package.xml',
+          problem: "Entity of type 'ApexClass' named 'NonExistant' cannot be found",
+        },
+      ]);
+    });
+
     it('should retrieve ApexClasses from wildcard match', async () => {
       const response = await testkit.retrieve({ args: '--metadata "ApexClass:Test*"' });
       expect(response?.status).to.equal(0);

test/nuts/specialTypes/nestedLWCProject/yarn.lock

@@ -3941,9 +3941,9 @@ ms@^2.1.1:
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 nanoid@^3.1.30:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
-  integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 nanomatch@^1.2.9:
   version "1.2.13"