Deploy 3.0.6

.travis.yml

@@ -12,23 +12,41 @@ install:
 jobs:
   include:
     - stage: analyze_format_test
-      name: "SDK: stable - chopper"
+      name: "SDK: stable - analyze_format_test chopper"
       script: ./tool/travis.sh build dartanalyzer dartfmt test
       env: PKG="chopper"
       dart: stable
     - stage: analyze_format_test
-      name: "SDK: stable - chopper generator"
+      name: "SDK: stable - analyze_format_test chopper_generator"
       script: ./tool/travis.sh dartanalyzer dartfmt
       env: PKG="chopper_generator"
       dart: stable
     - stage: analyze_format_test
-      name: "SDK: stable - example"
+      name: "SDK: stable - analyze_format_test example"
       script: ./tool/travis.sh build dartanalyzer dartfmt
       env: PKG="example"
       dart: stable
+  allow_failures:
+    - stage: deploy
+      name: "SDK: stable - deploy chopper"
+      script: ./tool/publish.sh
+      env: PKG="chopper"
+      dart: stable
+    - stage: deploy
+      name: "SDK: stable - deploy chopper_generator"
+      script: ./tool/publish.sh
+      env: PKG="chopper_generator"
+      dart: stable
+    - stage: deploy
+      name: "SDK: stable - deploy example"
+      script: ./tool/publish.sh
+      env: PKG="example"
+      dart: stable
 
 stages:
   - analyze_format_test
+  - deploy
+  if: branch = master
 
 # Only building master means that we don't run two builds for each pull request.
 branches:

README.md

@@ -4,7 +4,7 @@ description: Chopper is an http client generator using source_gen and inspired b
 
 # Chopper
 
-[![pub package](https://img.shields.io/pub/v/chopper.svg)](https://pub.dartlang.org/packages/chopper) [![Build Status](https://travis-ci.com/lejard-h/chopper.svg?branch=master)](https://travis-ci.org/lejard-h/chopper) [![codecov](https://codecov.io/gh/lejard-h/chopper/branch/master/graph/badge.svg)](https://codecov.io/gh/lejard-h/chopper)
+[![pub package](https://img.shields.io/pub/v/chopper.svg)](https://pub.dartlang.org/packages/chopper) [![Build Status](https://travis-ci.com/lejard-h/chopper.svg?branch=master)](https://travis-ci.com/lejard-h/chopper.svg?branch=master) [![codecov](https://codecov.io/gh/lejard-h/chopper/branch/master/graph/badge.svg)](https://codecov.io/gh/lejard-h/chopper)
 
 [Documentations](https://hadrien-lejard.gitbook.io/chopper)
 

chopper/lib/src/annotations.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'package:meta/meta.dart';
 import 'request.dart';
 import 'response.dart';
@@ -155,58 +156,114 @@ class Method {
   /// Headers [Map] that should be apply to the request
   final Map<String, String> headers;
 
-  const Method(this.method, {this.path = '', this.headers = const {}});
+  /// Mark the body as optional to suppress warnings during code generation
+  final bool optionalBody;
+
+  const Method(
+    this.method, {
+    this.optionalBody,
+    this.path = '',
+    this.headers = const {},
+  });
 }
 
 /// Defines a method as an HTTP GET request.
 @immutable
 class Get extends Method {
-  const Get({String path = '', Map<String, String> headers = const {}})
-      : super(HttpMethod.Get, path: path, headers: headers);
+  const Get({
+    bool optionalBody = true,
+    String path = '',
+    Map<String, String> headers = const {},
+  }) : super(
+          HttpMethod.Get,
+          optionalBody: optionalBody,
+          path: path,
+          headers: headers,
+        );
 }
 
 /// Defines a method as an HTTP POST request.
 ///
 /// Use the [Body] annotation to pass data to send.
 @immutable
 class Post extends Method {
-  const Post({String path = '', Map<String, String> headers = const {}})
-      : super(HttpMethod.Post, path: path, headers: headers);
+  const Post({
+    bool optionalBody = false,
+    String path = '',
+    Map<String, String> headers = const {},
+  }) : super(
+          HttpMethod.Post,
+          optionalBody: optionalBody,
+          path: path,
+          headers: headers,
+        );
 }
 
 /// Defines a method as an HTTP DELETE request.
 @immutable
 class Delete extends Method {
-  const Delete({String path = '', Map<String, String> headers = const {}})
-      : super(HttpMethod.Delete, path: path, headers: headers);
+  const Delete({
+    bool optionalBody = true,
+    String path = '',
+    Map<String, String> headers = const {},
+  }) : super(
+          HttpMethod.Delete,
+          optionalBody: optionalBody,
+          path: path,
+          headers: headers,
+        );
 }
 
 /// Defines a method as an HTTP PUT request.
 ///
 /// Use the [Body] annotation to pass data to send.
 @immutable
 class Put extends Method {
-  const Put({String path = '', Map<String, String> headers = const {}})
-      : super(HttpMethod.Put, path: path, headers: headers);
+  const Put({
+    bool optionalBody = false,
+    String path = '',
+    Map<String, String> headers = const {},
+  }) : super(
+          HttpMethod.Put,
+          optionalBody: optionalBody,
+          path: path,
+          headers: headers,
+        );
 }
 
 /// Defines a method as an HTTP PATCH request.
 /// Use the [Body] annotation to pass data to send.
 @immutable
 class Patch extends Method {
-  const Patch({String path = '', Map<String, String> headers = const {}})
-      : super(HttpMethod.Patch, path: path, headers: headers);
+  const Patch({
+    bool optionalBody = false,
+    String path = '',
+    Map<String, String> headers = const {},
+  }) : super(
+          HttpMethod.Patch,
+          optionalBody: optionalBody,
+          path: path,
+          headers: headers,
+        );
 }
 
 /// Defined a method as an HTTP HEAD request.
 @immutable
 class Head extends Method {
-  const Head({String path = '', Map<String, String> headers = const {}})
-      : super(HttpMethod.Head, path: path, headers: headers);
+  const Head({
+    bool optionalBody = true,
+    String path = '',
+    Map<String, String> headers = const {},
+  }) : super(
+          HttpMethod.Head,
+          optionalBody: optionalBody,
+          path: path,
+          headers: headers,
+        );
 }
 
-typedef ConvertRequest = Request Function(Request request);
-typedef ConvertResponse<T> = Response Function(Response response);
+typedef ConvertRequest = FutureOr<Request> Function(Request request);
+typedef ConvertResponse<T> = FutureOr<Response> Function(Response response);
 
 @immutable
 class FactoryConverter {

chopper/lib/src/request.dart

@@ -162,8 +162,11 @@ Uri buildUri(String baseUrl, String url, Map<String, dynamic> parameters) {
     }
   }
 
-  final query = mapToQuery(parameters);
+  var query = mapToQuery(parameters);
   if (query.isNotEmpty) {
+    if (uri.hasQuery) {
+      query += '&${uri.query}';
+    }
     return uri.replace(query: query);
   }
   return uri;

chopper/pubspec.yaml

@@ -1,6 +1,6 @@
 name: chopper
 description: Chopper is an http client generator using source_gen and inspired from retrofit
-version: 3.0.3
+version: 3.0.6
 homepage: https://hadrien-lejard.gitbook.io/chopper
 repository: https://github.com/lejard-h/chopper
 author: Hadrien Lejard <[email protected]>
@@ -10,16 +10,19 @@ environment:
 
 dependencies:
   http: ">=0.11.0 <1.0.0"
-  meta: ^1.1.8
+  meta: ^1.2.3
   logging: ^0.11.4
 
 dev_dependencies:
-  test: ^1.14.3
-  build_runner: ^1.10.0
-  build_test: ^1.0.0
-  coverage: ^0.13.9
-  test_coverage: ^0.4.1
+  test: ^1.15.4
+  build_runner: ^1.10.3
+  build_test: ^1.2.2
+  coverage: ^0.14.1
+  test_coverage:
+    git:
+      url: https://github.com/JEuler/test-coverage.git
+      ref: new-coverage
   http_parser: ^3.1.4
-  pedantic: ^1.9.0
+  pedantic: ^1.9.2
   chopper_generator:
     path: ../chopper_generator

chopper_built_value/pubspec.yaml

@@ -1,6 +1,6 @@
 name: chopper_built_value
 description: Chopper is an http client generator using source_gen and inspired from retrofit
-version: 0.0.3
+version: 0.0.6
 homepage: https://hadrien-lejard.gitbook.io/chopper
 repository: https://github.com/lejard-h/chopper
 author: Hadrien Lejard <[email protected]>
@@ -11,18 +11,18 @@ environment:
 dependencies:
   built_value: ^7.1.0
   built_collection: ^4.3.2
-  chopper: ^3.0.2
-  http: ^0.12.1
+  chopper: ^3.0.3
+  http: ^0.12.2
 
 dev_dependencies:
-  test: ^1.14.3
-  build_runner: ^1.10.0
+  test: ^1.15.4
+  build_runner: ^1.10.3
   build_test:
-  coverage: ^0.13.9
-  test_coverage: ^0.4.1
+  coverage: ^0.14.1
   built_value_generator: ^7.1.0
-  pedantic: ^1.9.0
+  pedantic: ^1.9.2
 
 dependency_overrides:
+  analyzer: 0.40.4
   chopper:
     path: ../chopper