Merge branch 'main' into sh/archiver-to-jszip-swap

.github/workflows/perfScaleNut.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: yarn
-      - run: npm install -g sfdx-cli --omit=dev
+      - run: npm install -g @salesforce/cli --omit=dev
       - run: yarn install
       - run: yarn test:nuts:scale
 

CHANGELOG.md

@@ -1,3 +1,39 @@
+## [8.5.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/8.5.2...8.5.3) (2023-05-22)
+
+
+### Bug Fixes
+
+* bump core to latest ([#982](https://github.com/forcedotcom/source-deploy-retrieve/issues/982)) ([7a34fc0](https://github.com/forcedotcom/source-deploy-retrieve/commit/7a34fc0214cf6172383f3b5e54f4dbeda36066a3)), closes [#983](https://github.com/forcedotcom/source-deploy-retrieve/issues/983)
+
+
+
+## [8.5.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/8.5.1...8.5.2) (2023-05-21)
+
+
+### Bug Fixes
+
+* **deps:** bump unzipper from 0.10.11 to 0.10.14 ([#978](https://github.com/forcedotcom/source-deploy-retrieve/issues/978)) ([777f799](https://github.com/forcedotcom/source-deploy-retrieve/commit/777f799e2ebc63602f8695e8b59d9c5cbb795f51))
+
+
+
+## [8.5.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/8.5.0...8.5.1) (2023-05-17)
+
+
+### Bug Fixes
+
+* prevent [object Object] and provide component details ([#972](https://github.com/forcedotcom/source-deploy-retrieve/issues/972)) ([a16b9a2](https://github.com/forcedotcom/source-deploy-retrieve/commit/a16b9a256b7ff2eac99f466b11ba30312b09ab92))
+
+
+
+# [8.5.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/8.4.0...8.5.0) (2023-05-17)
+
+
+### Features
+
+* support for UserAccessPolicy ([#971](https://github.com/forcedotcom/source-deploy-retrieve/issues/971)) ([7a102b0](https://github.com/forcedotcom/source-deploy-retrieve/commit/7a102b0eb64c5ac5ecca9f55f2ce43a78f6763f6))
+
+
+
 # [8.4.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/8.3.1...8.4.0) (2023-05-09)
 
 

METADATA_SUPPORT.md

@@ -4,7 +4,7 @@ This list compares metadata types found in Salesforce v58 with the [metadata reg
 
 This repository is used by both the Salesforce CLIs and Salesforce's VSCode Extensions.
 
-Currently, there are 516/550 supported metadata types.
+Currently, there are 516/549 supported metadata types.
 For status on any existing gaps, please search or file an issue in the [Salesforce CLI issues only repo](https://github.com/forcedotcom/cli/issues).
 To contribute a new metadata type, please see the [Contributing Metadata Types to the Registry](./contributing/metadata.md)
 
@@ -246,7 +246,6 @@ To contribute a new metadata type, please see the [Contributing Metadata Types t
 |ExternalDocStorageConfig|❌|Not supported, but support could be added|
 |ExternalServiceRegistration|✅||
 |ExtlClntAppGlobalOauthSettings|✅||
-|ExtlClntAppMobileSettings|✅||
 |ExtlClntAppOauthConfigurablePolicies|✅||
 |ExtlClntAppOauthSettings|✅||
 |FeatureParameterBoolean|✅||
@@ -519,7 +518,7 @@ To contribute a new metadata type, please see the [Contributing Metadata Types t
 |TrialOrgSettings|✅||
 |UIObjectRelationConfig|✅||
 |UiPlugin|✅||
-|UserAccessPolicy|❌|Not supported, but support could be added|
+|UserAccessPolicy|✅||
 |UserAuthCertificate|✅||
 |UserCriteria|✅||
 |UserEngagementSettings|✅||
@@ -568,6 +567,8 @@ v59 introduces the following new types.  Here's their current level of support
 
 |Metadata Type|Support|Notes|
 |:---|:---|:---|
+|FulfillmentStepType|❌|Not supported, but support could be added|
+|ProviderRelationshipMgmtConfig|❌|Not supported, but support could be added|
 
 ## Additional Types
 
@@ -599,6 +600,7 @@ v59 introduces the following new types.  Here's their current level of support
 - MatchingRule
 - MarketingResourceType
 - ExtlClntAppMobileConfigurablePolicies
+- ExtlClntAppMobileSettings
 - CustomExperience
 - ManagedTopic
 - DataPipeline

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/source-deploy-retrieve",
-  "version": "8.4.0",
+  "version": "8.5.3",
   "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
   "main": "lib/src/index.js",
   "author": "Salesforce",
@@ -25,7 +25,7 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@salesforce/core": "^3.36.0",
+    "@salesforce/core": "^3.36.2",
     "@salesforce/kit": "^1.9.2",
     "@salesforce/ts-types": "^1.7.2",
     "fast-levenshtein": "^3.0.0",
@@ -38,10 +38,10 @@
     "minimatch": "^5.1.6",
     "proxy-agent": "^5.0.0",
     "proxy-from-env": "^1.1.0",
-    "unzipper": "0.10.11"
+    "unzipper": "0.10.14"
   },
   "devDependencies": {
-    "@salesforce/cli-plugins-testkit": "^3.3.3",
+    "@salesforce/cli-plugins-testkit": "^3.4.0",
     "@salesforce/dev-config": "^3.1.0",
     "@salesforce/dev-scripts": "^4.3.0",
     "@salesforce/prettier-config": "^0.0.2",
@@ -60,7 +60,7 @@
     "chai": "^4.3.7",
     "deep-equal-in-any-order": "^1.1.19",
     "deepmerge": "^4.3.1",
-    "eslint": "^8.40.0",
+    "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-config-salesforce": "^1.2.0",
     "eslint-config-salesforce-license": "^0.2.0",

src/client/diagnosticUtil.ts

@@ -29,12 +29,14 @@ export class DiagnosticUtil {
         if (typeof message !== 'string') {
           return parseDefault(component, message);
         }
-        throw new SfError(`Unable to parse deploy diagnostic with string message: ${message}`);
+        throw new SfError(
+          `Unable to parse deploy diagnostic with string message: ${message} for component ${component.fullName}`
+        );
     }
   }
 
   private parseLwc(component: SourceComponent, message: string | DeployMessage): ComponentDiagnostic {
-    const problem = getProblemFromMessage(message);
+    const problem = getProblemFromMessage(message, component);
     const diagnostic: ComponentDiagnostic = {
       error: problem,
       problemType: 'Error',
@@ -77,7 +79,7 @@ export class DiagnosticUtil {
   }
 
   private parseAura(component: SourceComponent, message: string | DeployMessage): ComponentDiagnostic {
-    const problem = getProblemFromMessage(message);
+    const problem = getProblemFromMessage(message, component);
     const diagnostic: ComponentDiagnostic = {
       error: problem,
       problemType: 'Error',
@@ -122,13 +124,11 @@ const appendErrorWithLocation = (error: string, line: string | number, column: s
 
 const parseDefault = (component: SourceComponent, message: DeployMessage): ComponentDiagnostic => {
   const { problemType, fileName, lineNumber, columnNumber } = message;
-  const problem = getProblemFromMessage(message);
-  if (!problemType) {
-    throw new SfError(`Unable to parse deploy diagnostic with empty problem type: ${message.toString()}`);
-  }
+  const problem = getProblemFromMessage(message, component);
+
   const diagnostic: ComponentDiagnostic = {
     error: problem,
-    problemType,
+    problemType: problemType ?? 'Error',
   };
 
   if (fileName) {
@@ -145,10 +145,14 @@ const parseDefault = (component: SourceComponent, message: DeployMessage): Compo
   return diagnostic;
 };
 
-const getProblemFromMessage = (message: string | DeployMessage): string => {
+const getProblemFromMessage = (message: string | DeployMessage, component: SourceComponent): string => {
   const problem = typeof message === 'string' ? message : message.problem;
   if (!problem) {
-    throw new SfError(`Unable to parse deploy diagnostic with empty problem: ${message.toString()}`);
+    throw new SfError(
+      `Unable to parse deploy diagnostic with empty problem: ${JSON.stringify(message)} for component ${
+        component.fullName
+      }`
+    );
   }
   return problem;
 };

src/registry/metadataRegistry.json

@@ -3452,6 +3452,14 @@
           "aiScoringModelDefVersions": "aiscoringmodeldefversion"
         }
       }
+    },
+    "useraccesspolicy": {
+      "id": "useraccesspolicy",
+      "name": "UserAccessPolicy",
+      "suffix": "useraccesspolicy",
+      "directoryName": "useraccesspolicies",
+      "inFolder": false,
+      "strictDirectoryName": false
     }
   },
   "suffixes": {
@@ -3829,7 +3837,8 @@
     "locationUse": "locationuse",
     "personAccountOwnerPowerUser": "personaccountownerpoweruser",
     "pipelineInspMetricConfig": "pipelineinspmetricconfig",
-    "productSpecificationTypeDefinition": "productspecificationtypedefinition"
+    "productSpecificationTypeDefinition": "productspecificationtypedefinition",
+    "useraccesspolicy": "useraccesspolicy"
   },
   "strictDirectoryNames": {
     "experiences": "experiencebundle",

src/registry/nonSupportedTypes.ts

@@ -34,7 +34,7 @@ export const features = [
   'BOTBLOCKS',
   'INDUSTRIESINTERACTIONCALCULATION',
   'BUSINESSRULESENGINE',
-
+  'FUNDRAISING',
   'PARDOTADVANCED', // org:create throws a C-9999 when this is not excluded
 ];
 
@@ -76,8 +76,23 @@ export const metadataTypes = [
   // spun up with HIGHSCALEORDERS, not in describe
   'RegisteredExternalService',
 
+  // spun up org with ASSESSMENTS, not in describe
+  'AssessmentConfiguration',
+
+  // spun up org with INDUSTRIESEPCNEXTPILOT, not in describe
+  'ProductAttrDisplayConfig',
+  'ProductSpecificationRecType',
+  'ProductSpecificationType',
+
+  // spun up org with ASSOCIATIONENGINE, not in describe
+  'RecAlrtDataSrcExpSetDef',
+  'RecordAlertTemplate',
+
   // B2CLOYALTYMANAGEMENTPLUS, not in describe
   'ServiceProcess',
+
+  // does not show up in describe, but requires no features
+  'ProcessFlowMigration',
 ];
 
 export const hasUnsupportedFeatures = (type: CoverageObjectType): boolean => {

test/client/diagnosticUtil.test.ts

@@ -5,7 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { join } from 'path';
-import { expect } from 'chai';
+import { assert, expect } from 'chai';
+import { SfError } from '@salesforce/core';
 import { DiagnosticUtil } from '../../src/client/diagnosticUtil';
 import { DeployMessage, registry, SourceComponent } from '../../src';
 
@@ -53,6 +54,19 @@ describe('DiagnosticUtil', () => {
       });
     });
 
+    it('should throw friendly error for message with missing problem', () => {
+      const message = createDeployMessage({
+        problemType: 'Warning',
+      });
+      try {
+        util.parseDeployDiagnostic(component, message);
+      } catch (e) {
+        assert(e instanceof SfError);
+        expect(e.message).to.include('Unable to parse deploy diagnostic with empty problem');
+        expect(e.message).to.include(JSON.stringify(message));
+      }
+    });
+
     it('should create diagnostic for problem with file line and column info', () => {
       const message = createDeployMessage({
         problem: 'Expected a ;',