Merge pull request #16 from jonasfj/fix-10

Fix issue #10
google · Jul 17, 2019 · f9838e9 · f9838e9
2 parents 4830597 + 169d2be
commit f9838e9
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 22 deletions.
diff --git a/shelf_router_generator/CHANGELOG.md b/shelf_router_generator/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v0.7.2
+
+ * Use `literalString('...', raw: true)` from `package:code_builder` to ensure
+   that generated strings are properly escaped (fixing [#10][issue-10]).
+
+[issue-10]: https://github.com/google/dart-neats/issues/10
+
 ## v0.7.1
 
  * Bumped dependencies.

diff --git a/shelf_router_generator/example/main.g.dart b/shelf_router_generator/example/main.g.dart
diff --git a/shelf_router_generator/lib/src/shelf_router_generator.dart b/shelf_router_generator/lib/src/shelf_router_generator.dart
@@ -86,18 +86,18 @@ code.Code _buildAddHandlerCode({
   switch (handler.verb) {
     case r'$mount':
       return router.property('mount').call([
-        code.literal(handler.route),
+        code.literalString(handler.route, raw: true),
         service.property(handler.element.name),
       ]).statement;
     case r'$all':
       return router.property('all').call([
-        code.literal(handler.route),
+        code.literalString(handler.route, raw: true),
         service.property(handler.element.name),
       ]).statement;
     default:
       return router.property('add').call([
-        code.literal(handler.verb.toUpperCase()),
-        code.literal(handler.route),
+        code.literalString(handler.verb.toUpperCase()),
+        code.literalString(handler.route, raw: true),
         service.property(handler.element.name),
       ]).statement;
   }

diff --git a/shelf_router_generator/pubspec.yaml b/shelf_router_generator/pubspec.yaml
@@ -1,5 +1,5 @@
 name: shelf_router_generator
-version: 0.7.1
+version: 0.7.2
 authors:
   - Jonas Finnemann Jensen <jonasfj@google.com>
 description: |

diff --git a/shelf_router_generator/test/server/api.dart b/shelf_router_generator/test/server/api.dart
@@ -29,5 +29,10 @@ class Api {
     return Response.ok(word.toUpperCase());
   }
 
+  @Route.get(r'/$string-escape')
+  Response _stringEscapingWorks(Request request) {
+    return Response.ok('Just testing string escaping');
+  }
+
   Router get router => _$ApiRouter(this);
 }
diff --git a/shelf_router_generator/test/server/api.g.dart b/shelf_router_generator/test/server/api.g.dart
diff --git a/shelf_router_generator/test/server/service.g.dart b/shelf_router_generator/test/server/service.g.dart