fix(deps): apex-node7, core8 (#1230)

* fix(deps): bump apex-node, schema change for SDR required field * chore: dep bump for open PRs * fix: ts5.5 is smarter
salesforcecli · Jul 3, 2024 · 6e87dd1 · 6e87dd1
1 parent 78966a0
commit 6e87dd1
Show file tree

Hide file tree

Showing 8 changed files with 1,077 additions and 1,096 deletions.
diff --git a/package.json b/package.json
@@ -6,11 +6,11 @@
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^4",
-    "@salesforce/apex-node": "^6.0.0",
-    "@salesforce/core": "^8.0.1",
+    "@salesforce/apex-node": "^7.0.2",
+    "@salesforce/core": "^8.1.1",
     "@salesforce/kit": "^3.1.6",
     "@salesforce/sf-plugins-core": "^11.1.2",
-    "@salesforce/source-deploy-retrieve": "^12.0.1",
+    "@salesforce/source-deploy-retrieve": "^12.1.4",
     "@salesforce/source-tracking": "^7.0.1",
     "@salesforce/ts-types": "^2.0.10",
     "chalk": "^5.3.0",
@@ -23,19 +23,19 @@
     "@oclif/plugin-help": "^6.2.3",
     "@salesforce/cli-plugins-testkit": "^5.3.15",
     "@salesforce/dev-scripts": "^10.2.2",
-    "@salesforce/plugin-command-reference": "^3.1.5",
+    "@salesforce/plugin-command-reference": "^3.1.8",
     "@salesforce/source-testkit": "^2.2.23",
     "@salesforce/ts-sinon": "1.4.20",
     "@types/archiver": "^5.3.2",
     "@types/cli-progress": "^3.11.5",
     "archiver": "^5.3.2",
     "chai-each": "^0.0.1",
     "cross-env": "^7.0.3",
-    "eslint-plugin-sf-plugin": "^1.18.8",
+    "eslint-plugin-sf-plugin": "^1.18.10",
     "fast-glob": "^3.3.1",
-    "oclif": "^4.10.11",
+    "oclif": "^4.13.12",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.3"
   },
   "config": {},
   "engines": {

diff --git a/schemas/force-source-deploy.json b/schemas/force-source-deploy.json
@@ -461,6 +461,10 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
+        "state": {
+          "type": "string",
+          "enum": ["Created", "Changed", "Unchanged", "Deleted"]
+        },
         "fullName": {
           "type": "string"
         },
@@ -469,13 +473,9 @@
         },
         "filePath": {
           "type": "string"
-        },
-        "state": {
-          "type": "string",
-          "enum": ["Created", "Changed", "Unchanged", "Deleted"]
         }
       },
-      "required": ["fullName", "state", "type"]
+      "required": ["state"]
     },
     "FileResponseFailure": {
       "type": "object",

diff --git a/schemas/force-source-pull.json b/schemas/force-source-pull.json
@@ -24,7 +24,7 @@
                 "type": "string"
               }
             },
-            "required": ["fullName", "state", "type"],
+            "required": ["state"],
             "additionalProperties": false
           }
         }

diff --git a/schemas/force-source-push.json b/schemas/force-source-push.json
@@ -24,7 +24,7 @@
                 "type": "string"
               }
             },
-            "required": ["fullName", "state", "type"],
+            "required": ["state"],
             "additionalProperties": false
           }
         },

diff --git a/schemas/force-source-retrieve.json b/schemas/force-source-retrieve.json
@@ -44,6 +44,10 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
+        "state": {
+          "type": "string",
+          "enum": ["Created", "Changed", "Unchanged", "Deleted"]
+        },
         "fullName": {
           "type": "string"
         },
@@ -52,13 +56,9 @@
         },
         "filePath": {
           "type": "string"
-        },
-        "state": {
-          "type": "string",
-          "enum": ["Created", "Changed", "Unchanged", "Deleted"]
         }
       },
-      "required": ["fullName", "state", "type"]
+      "required": ["state"]
     },
     "FileResponseFailure": {
       "type": "object",

diff --git a/src/formatters/source/pushResultFormatter.ts b/src/formatters/source/pushResultFormatter.ts
@@ -228,8 +228,8 @@ export class PushResultFormatter extends ResultFormatter {
         .filter((f) => f.state === ComponentStatus.Failed)
         .map((f) => {
           // we've filtered all of the file responses to failed errors with the state filter  above
-          fileResponses.push(f as FileResponseFailure);
-          fileResponseFailures.set(`${f.type}#${f.fullName}`, (f as FileResponseFailure).error);
+          fileResponses.push(f);
+          fileResponseFailures.set(`${f.type}#${f.fullName}`, f.error);
         });
       this.sortFileResponses(fileResponses);
       this.asRelativePaths(fileResponses);

diff --git a/src/trackingFunctions.ts b/src/trackingFunctions.ts
@@ -22,7 +22,7 @@ const messages = Messages.loadMessages('@salesforce/plugin-source', 'tracking');
 type TrackingSetupRequest = {
   ignoreConflicts: boolean;
   ux: Ux;
-} & SourceTrackingOptions
+} & SourceTrackingOptions;
 
 type TrackingUpdateRequest = {
   tracking: SourceTracking;
@@ -33,7 +33,7 @@ type TrackingUpdateRequest = {
    * You can also pass this in if your command already ran getFileResponses and you want to avoid the perf hit from doing it twice
    */
   fileResponses?: FileResponse[];
-}
+};
 
 type ConflictResponse = {
   state: 'Conflict';
@@ -100,10 +100,10 @@ export const updateTracking = async ({ tracking, result, ux, fileResponses }: Tr
     tracking.updateLocalTracking({
       files: successes
         .filter((fileResponse) => fileResponse.state !== ComponentStatus.Deleted)
-        .map((fileResponse) => fileResponse.filePath as string),
+        .map((fileResponse) => fileResponse.filePath),
       deletedFiles: successes
         .filter((fileResponse) => fileResponse.state === ComponentStatus.Deleted)
-        .map((fileResponse) => fileResponse.filePath as string),
+        .map((fileResponse) => fileResponse.filePath),
     }),
     tracking.updateRemoteTracking(
       successes.map(({ state, fullName, type, filePath }) => ({ state, fullName, type, filePath })),