Merge pull request #954 from salesforcecli/sm/registry-variants

feat: registryVariants
salesforcecli · Mar 29, 2024 · 6f216dc · 6f216dc
2 parents b1864ae + b13aeea
commit 6f216dc
Show file tree

Hide file tree

Showing 38 changed files with 1,545 additions and 3,659 deletions.
diff --git a/package.json b/package.json
@@ -6,27 +6,26 @@
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^3.26.0",
-    "@salesforce/apex-node": "^3.1.0",
+    "@salesforce/apex-node": "^4.0.2",
     "@salesforce/core": "^6.7.3",
-    "@salesforce/kit": "^3.0.15",
-    "@salesforce/plugin-info": "^3.0.33",
-    "@salesforce/sf-plugins-core": "^8.0.0",
-    "@salesforce/source-deploy-retrieve": "^10.5.5",
-    "@salesforce/source-tracking": "^5.1.18",
+    "@salesforce/kit": "^3.1.0",
+    "@salesforce/plugin-info": "^3.1.0",
+    "@salesforce/sf-plugins-core": "^8.0.2",
+    "@salesforce/source-deploy-retrieve": "^10.6.1",
+    "@salesforce/source-tracking": "^5.2.0",
     "@salesforce/ts-types": "^2.0.9",
     "chalk": "^5.3.0"
   },
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^5.1.2",
-    "@salesforce/cli-plugins-testkit": "^5.1.10",
+    "@oclif/plugin-command-snapshot": "^5.1.4",
+    "@salesforce/cli-plugins-testkit": "^5.1.12",
     "@salesforce/dev-scripts": "^8.4.2",
-    "@salesforce/plugin-command-reference": "^3.0.71",
-    "@salesforce/plugin-source": "^2.11.4",
-    "@salesforce/source-testkit": "^2.1.105",
+    "@salesforce/plugin-command-reference": "^3.0.73",
+    "@salesforce/source-testkit": "^2.1.108",
     "@salesforce/ts-sinon": "^1.4.19",
     "cross-env": "^7.0.3",
     "eslint-plugin-sf-plugin": "^1.17.4",
-    "oclif": "^4.4.19",
+    "oclif": "^4.7.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.3"
   },

diff --git a/schemas/project-delete-source.json b/schemas/project-delete-source.json
@@ -197,8 +197,7 @@
       "type": "object",
       "properties": {
         "changed": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "columnNumber": {
           "type": "string"
@@ -207,15 +206,13 @@
           "type": "string"
         },
         "created": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "createdDate": {
           "type": "string"
         },
         "deleted": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "fileName": {
           "type": "string"
@@ -237,13 +234,16 @@
           "enum": ["Warning", "Error"]
         },
         "success": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         }
       },
       "required": ["changed", "created", "createdDate", "deleted", "fileName", "fullName", "success"],
       "additionalProperties": false
     },
+    "BooleanString": {
+      "type": ["string", "boolean"],
+      "enum": ["true", "false", true, false]
+    },
     "RunTestResult": {
       "type": "object",
       "properties": {

diff --git a/schemas/project-deploy-cancel.json b/schemas/project-deploy-cancel.json
@@ -236,8 +236,7 @@
       "type": "object",
       "properties": {
         "changed": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "columnNumber": {
           "type": "string"
@@ -246,15 +245,13 @@
           "type": "string"
         },
         "created": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "createdDate": {
           "type": "string"
         },
         "deleted": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "fileName": {
           "type": "string"
@@ -276,13 +273,16 @@
           "enum": ["Warning", "Error"]
         },
         "success": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         }
       },
       "required": ["changed", "created", "createdDate", "deleted", "fileName", "fullName", "success"],
       "additionalProperties": false
     },
+    "BooleanString": {
+      "type": ["string", "boolean"],
+      "enum": ["true", "false", true, false]
+    },
     "RunTestResult": {
       "type": "object",
       "properties": {

diff --git a/schemas/project-deploy-quick.json b/schemas/project-deploy-quick.json
@@ -236,8 +236,7 @@
       "type": "object",
       "properties": {
         "changed": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "columnNumber": {
           "type": "string"
@@ -246,15 +245,13 @@
           "type": "string"
         },
         "created": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "createdDate": {
           "type": "string"
         },
         "deleted": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "fileName": {
           "type": "string"
@@ -276,13 +273,16 @@
           "enum": ["Warning", "Error"]
         },
         "success": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         }
       },
       "required": ["changed", "created", "createdDate", "deleted", "fileName", "fullName", "success"],
       "additionalProperties": false
     },
+    "BooleanString": {
+      "type": ["string", "boolean"],
+      "enum": ["true", "false", true, false]
+    },
     "RunTestResult": {
       "type": "object",
       "properties": {

diff --git a/schemas/project-deploy-report.json b/schemas/project-deploy-report.json
@@ -236,8 +236,7 @@
       "type": "object",
       "properties": {
         "changed": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "columnNumber": {
           "type": "string"
@@ -246,15 +245,13 @@
           "type": "string"
         },
         "created": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "createdDate": {
           "type": "string"
         },
         "deleted": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "fileName": {
           "type": "string"
@@ -276,13 +273,16 @@
           "enum": ["Warning", "Error"]
         },
         "success": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         }
       },
       "required": ["changed", "created", "createdDate", "deleted", "fileName", "fullName", "success"],
       "additionalProperties": false
     },
+    "BooleanString": {
+      "type": ["string", "boolean"],
+      "enum": ["true", "false", true, false]
+    },
     "RunTestResult": {
       "type": "object",
       "properties": {

diff --git a/schemas/project-deploy-resume.json b/schemas/project-deploy-resume.json
@@ -236,8 +236,7 @@
       "type": "object",
       "properties": {
         "changed": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "columnNumber": {
           "type": "string"
@@ -246,15 +245,13 @@
           "type": "string"
         },
         "created": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "createdDate": {
           "type": "string"
         },
         "deleted": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "fileName": {
           "type": "string"
@@ -276,13 +273,16 @@
           "enum": ["Warning", "Error"]
         },
         "success": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         }
       },
       "required": ["changed", "created", "createdDate", "deleted", "fileName", "fullName", "success"],
       "additionalProperties": false
     },
+    "BooleanString": {
+      "type": ["string", "boolean"],
+      "enum": ["true", "false", true, false]
+    },
     "RunTestResult": {
       "type": "object",
       "properties": {

diff --git a/schemas/project-deploy-start.json b/schemas/project-deploy-start.json
@@ -236,8 +236,7 @@
       "type": "object",
       "properties": {
         "changed": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "columnNumber": {
           "type": "string"
@@ -246,15 +245,13 @@
           "type": "string"
         },
         "created": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "createdDate": {
           "type": "string"
         },
         "deleted": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "fileName": {
           "type": "string"
@@ -276,13 +273,16 @@
           "enum": ["Warning", "Error"]
         },
         "success": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         }
       },
       "required": ["changed", "created", "createdDate", "deleted", "fileName", "fullName", "success"],
       "additionalProperties": false
     },
+    "BooleanString": {
+      "type": ["string", "boolean"],
+      "enum": ["true", "false", true, false]
+    },
     "RunTestResult": {
       "type": "object",
       "properties": {

diff --git a/schemas/project-deploy-validate.json b/schemas/project-deploy-validate.json
@@ -236,8 +236,7 @@
       "type": "object",
       "properties": {
         "changed": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "columnNumber": {
           "type": "string"
@@ -246,15 +245,13 @@
           "type": "string"
         },
         "created": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "createdDate": {
           "type": "string"
         },
         "deleted": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         },
         "fileName": {
           "type": "string"
@@ -276,13 +273,16 @@
           "enum": ["Warning", "Error"]
         },
         "success": {
-          "type": ["string", "boolean"],
-          "enum": ["true", "false", true, false]
+          "$ref": "#/definitions/BooleanString"
         }
       },
       "required": ["changed", "created", "createdDate", "deleted", "fileName", "fullName", "success"],
       "additionalProperties": false
     },
+    "BooleanString": {
+      "type": ["string", "boolean"],
+      "enum": ["true", "false", true, false]
+    },
     "RunTestResult": {
       "type": "object",
       "properties": {

diff --git a/src/commands/project/convert/mdapi.ts b/src/commands/project/convert/mdapi.ts
@@ -14,6 +14,7 @@ import {
   ComponentSetBuilder,
   ConvertResult,
   MetadataConverter,
+  RegistryAccess,
 } from '@salesforce/source-deploy-retrieve';
 import {
   arrayWithDeprecation,
@@ -117,13 +118,13 @@ export class Mdapi extends SfCommand<ConvertMdapiJson> {
             directoryPaths: [this.flags['root-dir']],
           }
         : undefined,
+      ...(this.project ? { projectDir: this.project?.getPath() } : {}),
     });
 
     const numOfComponents = this.componentSet.getSourceComponents().toArray().length;
     if (numOfComponents > 0) {
       this.spinner.start(`Converting ${numOfComponents} metadata components`);
-
-      const converter = new MetadataConverter();
+      const converter = new MetadataConverter(new RegistryAccess(undefined, this.project?.getPath()));
       this.convertResult = await converter.convert(this.componentSet, 'source', {
         type: 'directory',
         outputDirectory: outputDir,