better verbose typings

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

arduino-ide-extension/src/browser/contributions/upload-sketch.ts

@@ -214,7 +214,7 @@ export class UploadSketch extends CoreServiceContribution {
         fqbn,
         { selectedProgrammer },
         verify,
-        verbose,
+        uploadVerbose,
         sourceOverride,
         optimizeForDebug,
         compileVerbose,
@@ -232,10 +232,7 @@ export class UploadSketch extends CoreServiceContribution {
         this.preferences.get('arduino.compile.verbose'),
       ]);
 
-      const compileStepOptions: Partial<CoreService.Compile.Options> = {
-        verbose: compileVerbose,
-      };
-
+      const verbose = { compile: compileVerbose, upload: uploadVerbose };
       const board = {
         ...boardsConfig.selectedBoard,
         name: boardsConfig.selectedBoard?.name || '',
@@ -283,12 +280,9 @@ export class UploadSketch extends CoreServiceContribution {
       }
       this.outputChannelManager.getChannel('Arduino').clear();
       if (usingProgrammer) {
-        await this.coreService.uploadUsingProgrammer(
-          options,
-          compileStepOptions
-        );
+        await this.coreService.uploadUsingProgrammer(options);
       } else {
-        await this.coreService.upload(options, compileStepOptions);
+        await this.coreService.upload(options);
       }
       this.messageService.info(
         nls.localize('arduino/sketch/doneUploading', 'Done uploading.'),

arduino-ide-extension/src/common/protocol/core-service.ts

@@ -67,14 +67,8 @@ export interface CoreService {
         compilerWarnings?: CompilerWarnings;
       }>
   ): Promise<void>;
-  upload(
-    options: CoreService.Upload.Options,
-    additionalCompileOptions: Partial<CoreService.Compile.Options>
-  ): Promise<void>;
-  uploadUsingProgrammer(
-    options: CoreService.Upload.Options,
-    additionalCompileOptions: Partial<CoreService.Compile.Options>
-  ): Promise<void>;
+  upload(options: CoreService.Upload.Options): Promise<void>;
+  uploadUsingProgrammer(options: CoreService.Upload.Options): Promise<void>;
   burnBootloader(options: CoreService.Bootloader.Options): Promise<void>;
 }
 
@@ -90,11 +84,12 @@ export namespace CoreService {
   }
 
   export namespace Upload {
-    export interface Options extends Compile.Options {
+    export interface Options extends Omit<Compile.Options, 'verbose'> {
       readonly port?: Port;
       readonly programmer?: Programmer | undefined;
       readonly verify: boolean;
       readonly userFields: BoardUserField[];
+      readonly verbose: { compile: boolean; upload: boolean };
     }
   }
 

arduino-ide-extension/src/node/core-service-impl.ts

@@ -163,13 +163,9 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
     return request;
   }
 
-  upload(
-    options: CoreService.Upload.Options,
-    additionalCompileOptions: Partial<CoreService.Compile.Options>
-  ): Promise<void> {
+  upload(options: CoreService.Upload.Options): Promise<void> {
     return this.doUpload(
       options,
-      additionalCompileOptions,
       () => new UploadRequest(),
       (client, req) => client.upload(req),
       (message: string, locations: CoreError.ErrorLocation[]) =>
@@ -179,12 +175,10 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
   }
 
   async uploadUsingProgrammer(
-    options: CoreService.Upload.Options,
-    additionalCompileOptions: Partial<CoreService.Compile.Options>
+    options: CoreService.Upload.Options
   ): Promise<void> {
     return this.doUpload(
       options,
-      additionalCompileOptions,
       () => new UploadUsingProgrammerRequest(),
       (client, req) => client.uploadUsingProgrammer(req),
       (message: string, locations: CoreError.ErrorLocation[]) =>
@@ -195,7 +189,6 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
 
   protected async doUpload(
     options: CoreService.Upload.Options,
-    additionalCompileOptions: Partial<CoreService.Compile.Options>,
     requestFactory: () => UploadRequest | UploadUsingProgrammerRequest,
     responseHandler: (
       client: ArduinoCoreServiceClient,
@@ -209,7 +202,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
   ): Promise<void> {
     await this.compile({
       ...options,
-      ...additionalCompileOptions,
+      verbose: options.verbose.compile,
       exportBinaries: false,
     });
 
@@ -273,7 +266,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
     if (programmer) {
       request.setProgrammer(programmer.id);
     }
-    request.setVerbose(options.verbose);
+    request.setVerbose(options.verbose.upload);
     request.setVerify(options.verify);
 
     options.userFields.forEach((e) => {