fix(dynamite): Escape wireNames

Signed-off-by: provokateurin <kate@provokateurin.de>
nextcloud · Aug 30, 2024 · 5915c57 · 5915c57
1 parent 2f3fcf0
commit 5915c57
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/packages/dynamite/lib/src/builder/resolve_interface.dart b/packages/dynamite/lib/src/builder/resolve_interface.dart
@@ -9,6 +9,7 @@ import 'package:dynamite/src/helpers/dynamite.dart';
 import 'package:dynamite/src/helpers/pattern_check.dart';
 import 'package:dynamite/src/models/json_schema.dart' as json_schema;
 import 'package:dynamite/src/models/type_result.dart';
+import 'package:source_helper/source_helper.dart';
 
 Spec buildInterface(
   State state,
@@ -245,7 +246,7 @@ void _generateProperty(
 
         final builtValueFieldAnnotations = <String, Expression>{};
         if (dartName != propertyName) {
-          builtValueFieldAnnotations['wireName'] = literalString(propertyName);
+          builtValueFieldAnnotations['wireName'] = refer(escapeDartString(propertyName));
         }
 
         if (builtValueFieldAnnotations.isNotEmpty) {

diff --git a/packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.dart
@@ -68,6 +68,8 @@ abstract class Base implements $BaseInterface, Built<Base, BaseBuilder> {
 @BuiltValue(instantiable: false)
 sealed class $BaseInterfaceInterface {
   String? get attribute;
+  @BuiltValueField(wireName: r'$property')
+  String? get property;
 
   /// Rebuilds the instance.
   ///

diff --git a/packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.g.dart b/packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.g.dart
diff --git a/packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.json b/packages/dynamite/packages/dynamite_end_to_end_test/lib/interfaces.openapi.json
@@ -19,6 +19,9 @@
                 "properties": {
                     "attribute": {
                         "type": "string"
+                    },
+                    "$property": {
+                        "type": "string"
                     }
                 }
             }