Sm/no zip in json (#514)

* chore: updates from devScripts * fix(deps): bump deps * test: more jobs on smaller boxes * chore: bump cmd-ref * chore: bump more dev-deps * chore: bump testkit and source-testkit * fix: no zip contents in json * chore: regen schema --------- Co-authored-by: svc-cli-bot <[email protected]>
salesforcecli · Feb 27, 2023 · 62e4836 · 62e4836
1 parent 2bb51e3
commit 62e4836
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -6,4 +6,7 @@
  */
 module.exports = {
   extends: ['eslint-config-salesforce-typescript', 'eslint-config-salesforce-license', 'plugin:sf-plugin/recommended'],
+  rules: {
+    '@typescript-eslint/no-unused-vars': ['error', { ignoreRestSiblings: true }],
+  },
 };
diff --git a/schemas/retrieve-metadata.json b/schemas/retrieve-metadata.json
@@ -51,13 +51,9 @@
                   "$ref": "#/definitions/RetrieveMessage"
                 }
               ]
-            },
-            "zipFile": {
-              "type": "string",
-              "description": "`base64` encoded string"
             }
           },
-          "required": ["done", "fileProperties", "files", "id", "status", "success", "zipFile"]
+          "required": ["done", "fileProperties", "files", "id", "status", "success"]
         },
         {
           "$ref": "#/definitions/MetadataRetrieveResultJson"

diff --git a/src/utils/output.ts b/src/utils/output.ts
@@ -420,7 +420,8 @@ export class RetrieveResultFormatter implements Formatter<RetrieveResultJson> {
   }
 
   public getJson(): RetrieveResultJson {
-    return { ...this.result.response, files: this.files };
+    const { zipFile, ...responseWithoutZip } = this.result.response;
+    return { ...responseWithoutZip, files: this.files };
   }
 
   public async display(): Promise<void> {

diff --git a/src/utils/types.ts b/src/utils/types.ts
@@ -50,7 +50,9 @@ export type MetadataRetrieveResultJson = Omit<MetadataApiRetrieveStatus, 'zipFil
   files: FileResponse[];
 };
 
-export type RetrieveResultJson = (MetadataApiRetrieveStatus & { files: FileResponse[] }) | MetadataRetrieveResultJson;
+export type RetrieveResultJson =
+  | (Omit<MetadataApiRetrieveStatus, 'zipFile'> & { files: FileResponse[] })
+  | MetadataRetrieveResultJson;
 
 /** validates source component with fullname, type, and xml props */
 export const isSourceComponent = (sc: unknown): sc is SourceComponent & { xml: string } =>