Jaguar-dart · tejainece · Aug 31, 2018 · Aug 30, 2018
diff --git a/resty/lib/src/jaguar_resty_base.dart b/resty/lib/src/jaguar_resty_base.dart
@@ -24,7 +24,9 @@ OptionsMethod options(String url) => OptionsMethod(url);
 ht.BaseClient globalClient;
 
 class RouteBase {
-  RouteBase([String url]) {
+  Map<String, dynamic> metaData;
+
+  RouteBase([String url, Map<String, dynamic> metaData]) {
     if (url != null) setUrl(url);
   }
 
@@ -153,6 +155,11 @@ class RouteBase {
     return this;
   }
 
+  RouteBase setMetaData(Map<String, dynamic> metaData) {
+    this.metaData = metaData;
+    return this;
+  }
+
   RouteBase setUrl(String url) {
     final purl = Uri.parse(url);
     if (purl.hasAuthority) origin(purl.origin);
@@ -278,6 +285,8 @@ class Get extends RouteBase {
 
   Get query(String key, value) => super.query(key, value);
 
+  Get setMetaData(Map<String, dynamic> metaData) => super.setMetaData(metaData);
+
   Get queries(Map<String, dynamic> value) => super.queries(value);
 
   Get header(String key, String value) => super.header(key, value);
@@ -415,6 +424,8 @@ class Post extends RouteBase {
 
   Post query(String key, value) => super.query(key, value);
 
+  Post setMetaData(Map<String, dynamic> metaData) => super.setMetaData(metaData);
+
   Post queries(Map<String, dynamic> value) => super.queries(value);
 
   Post header(String key, String value) => super.header(key, value);
@@ -639,6 +650,8 @@ class Put extends RouteBase {
 
   Put query(String key, value) => super.query(key, value);
 
+  Put setMetaData(Map<String, dynamic> metaData) => super.setMetaData(metaData);
+
   Put queries(Map<String, dynamic> value) => super.queries(value);
 
   Put header(String key, String value) => super.header(key, value);
@@ -862,6 +875,8 @@ class Delete extends RouteBase {
 
   Delete query(String key, value) => super.query(key, value);
 
+  Delete setMetaData(Map<String, dynamic> metaData) => super.setMetaData(metaData);
+
   Delete queries(Map<String, dynamic> value) => super.queries(value);
 
   Delete header(String key, String value) => super.header(key, value);
@@ -1000,6 +1015,8 @@ class OptionsMethod extends RouteBase {
 
   OptionsMethod query(String key, value) => super.query(key, value);
 
+  OptionsMethod setMetaData(Map<String, dynamic> metaData) => super.setMetaData(metaData);
+
   OptionsMethod queries(Map<String, dynamic> value) => super.queries(value);
 
   OptionsMethod header(String key, String value) => super.header(key, value);

diff --git a/retrofit/example/example.dart b/retrofit/example/example.dart
@@ -13,15 +13,15 @@ import 'package:jaguar/jaguar.dart' as jaguar;
 part 'example.jretro.dart';
 
 /// Example showing how to define an [ApiClient]
-@GenApiClient(path: "/users")
+@GenApiClient(path: "/users", metaData: {"base": "test"})
 class UserApi extends _$UserApiClient implements ApiClient {
   final resty.Route base;
 
   final SerializerRepo serializers;
 
   UserApi({this.base, this.serializers});
 
-  @GetReq("/:id")
+  @GetReq("/:id", {"token": "test", "bool": true, "int": 1, "double": 2.2})
   Future<User> getUserById(String id, @QueryParam("test") String test);
 
   @PostReq("/")
@@ -75,7 +75,12 @@ void server() async {
 
 void client() async {
   globalClient = IOClient();
-  var api = UserApi(base: route("http://localhost:10000"), serializers: repo);
+  var api = UserApi(base: route("http://localhost:10000")..interceptBefore((route) {
+    if(route.metaData != null) {
+      print("Meta data");
+      print(route.metaData);
+    }
+  }), serializers: repo);
 
   try {
     await api.login(Login(username: 'teja', password: 'pass'));

diff --git a/retrofit/example/example.jretro.dart b/retrofit/example/example.jretro.dart
diff --git a/retrofit/lib/annotations/annotations.dart b/retrofit/lib/annotations/annotations.dart
@@ -3,5 +3,6 @@ export 'params.dart';
 
 class GenApiClient {
   final String path;
-  const GenApiClient({this.path});
+  final Map<String, dynamic> metaData;
 }
diff --git a/retrofit/lib/annotations/requests.dart b/retrofit/lib/annotations/requests.dart
@@ -1,33 +1,40 @@
 abstract class Req {
   String get path;
+  Map<String, dynamic> get metaData;
 }
 
 class GetReq implements Req {
   final String path;
-  const GetReq([this.path = ""]);
+  final Map<String, dynamic> metaData;
+  const GetReq([this.path = "", this.metaData]);
 }
 
 class PostReq implements Req {
   final String path;
-  const PostReq([this.path = ""]);
+  final Map<String, dynamic> metaData;
+  const PostReq([this.path = "", this.metaData]);
 }
 
 class PutReq implements Req {
   final String path;
-  const PutReq([this.path = ""]);
+  final Map<String, dynamic> metaData;
+  const PutReq([this.path = "", this.metaData]);
 }
 
 class DeleteReq implements Req {
   final String path;
-  const DeleteReq([this.path = ""]);
+  final Map<String, dynamic> metaData;
+  const DeleteReq([this.path = "", this.metaData]);
 }
 
 class HeadReq implements Req {
   final String path;
-  const HeadReq([this.path = ""]);
+  final Map<String, dynamic> metaData;
+  const HeadReq([this.path = "", this.metaData]);
 }
 
 class PatchReq implements Req {
   final String path;
-  const PatchReq([this.path = "/"]);
+  final Map<String, dynamic> metaData;
+  const PatchReq([this.path = "/", this.metaData]);
 }
diff --git a/retrofit/pubspec.yaml b/retrofit/pubspec.yaml
@@ -13,7 +13,6 @@ dependencies:
   jaguar_serializer: ^2.2.0
   http: ^0.11.3
   meta: ^1.1.5
-  jaguar_resty: ^2.6.10
 
 dev_dependencies:
   test: ^1.3.0
@@ -22,3 +21,5 @@ dev_dependencies:
   jaguar: ^2.2.20
   jaguar_retrofit_gen:
     path: ../retrofit_gen
+  jaguar_resty:
+    path: ../resty
diff --git a/retrofit_gen/lib/parsed_info/parsed_info.dart b/retrofit_gen/lib/parsed_info/parsed_info.dart
@@ -1,3 +1,4 @@
+import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element.dart' show MethodElement;
 import 'package:analyzer/dart/element/type.dart';
 import 'package:jaguar_retrofit_gen/utils/utils.dart';
@@ -88,6 +89,8 @@ class Req {
 
   final String path;
 
+  final Map<DartObject, DartObject> metaData;
+
   final Set<String> pathParams;
 
   final Map<String, String> query;
@@ -106,6 +109,7 @@ class Req {
 
   Req(this.method, this.me,
       {this.path,
+      this.metaData,
       this.query,
       this.headers,
       this.body,
@@ -118,8 +122,9 @@ class Req {
 class WriteInfo {
   final String name;
   final String basePath;
+  final Map<DartObject, DartObject> baseMetaData;
 
   final List<Req> requests;
 
-  WriteInfo(this.name, this.basePath, this.requests);
+  WriteInfo(this.name, this.basePath, this.baseMetaData, this.requests);
 }
diff --git a/retrofit_gen/lib/parser/parser.dart b/retrofit_gen/lib/parser/parser.dart
@@ -7,6 +7,8 @@ import '../parsed_info/parsed_info.dart';
 Req _parseReq(String httpMethod, DartObject annot, MethodElement method) {
   final reader = ConstantReader(annot);
   String path = reader.read('path').stringValue;
+  final metaDataContent = reader.read('metaData');
+  Map<DartObject, DartObject> metaData = metaDataContent.isNull ? null : metaDataContent.mapValue;
   var varPathSegs = <String>[];
   if (path != null)
     varPathSegs = path
@@ -91,6 +93,7 @@ Req _parseReq(String httpMethod, DartObject annot, MethodElement method) {
   return Req(httpMethod, method,
       path: path,
       query: query,
+      metaData: metaData,
       headers: headers,
       body: body,
       pathParams: pathParams,
@@ -102,6 +105,7 @@ WriteInfo parse(ClassElement element, ConstantReader annotation) {
 
   final an = isGenApiClient.firstAnnotationOfExact(element);
   final basePath = an.getField("path").toStringValue();
+  final baseMetaData = an.getField("metaData").toMapValue();
 
   final reqs = <Req>[];
 
@@ -123,5 +127,5 @@ WriteInfo parse(ClassElement element, ConstantReader annotation) {
     }
   }
 
-  return WriteInfo(element.displayName, basePath, reqs);
+  return WriteInfo(element.displayName, basePath, baseMetaData, reqs);
 }
diff --git a/retrofit_gen/lib/writer/writer.dart b/retrofit_gen/lib/writer/writer.dart
@@ -15,13 +15,49 @@ class Writer {
     sb.writeln('}');
   }
 
+  void _writeMetaData(Map<dynamic, dynamic> metaData) {
+    sb.write('.setMetaData({');
+    metaData.forEach((key, value)  {
+      sb.write('"${key.toStringValue()}":');
+
+      if(value.toStringValue() != null) {
+        sb.write('"${value.toStringValue()}",');
+      }
+      else if(value.toBoolValue() != null) {
+        sb.write('${value.toBoolValue()},');
+      }
+      else if(value.toIntValue() != null) {
+        sb.write('${value.toIntValue()},');
+      }
+      else if(value.toDoubleValue() != null) {
+        sb.write('${value.toDoubleValue()},');
+      }
+      else if(value is List) {
+        throw UnsupportedError("$key: List is not supported as meta data");
+      }
+      else if(value is Map) {
+        throw UnsupportedError("$key: Map is not supported as meta data");
+      }
+      else {
+        throw UnsupportedError("$key: Type is not supported as meta data");
+      }
+    });
+    sb.write('})');
+  }
+
   void _writeRequest(Req r) {
     sb.write(_writeFunctionSignature(r.me));
 
     sb.writeln(' async {');
 
     sb.write('var req = base.${r.method}');
 
+    if (r.metaData != null) {
+      _writeMetaData(r.metaData);
+    } else if(i.baseMetaData != null) {
+      _writeMetaData(i.baseMetaData);
+    }
+
     if (i.basePath != null) sb.write('.path(basePath)');
     if (r.path != null) sb.write('.path("${r.path}")');