[v1.0.11] fixes #7

valgene · May 20, 2019 · ae09c15 · ae09c15
1 parent 1cbc9bd
commit ae09c15
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.11
+
+- fixed #7 strings with default value null came out as "null" 
+
 ## 1.0.10
 
 - small improvement on DTO Validator template

diff --git a/lib/generator.dart b/lib/generator.dart
@@ -41,7 +41,7 @@ class FieldCodeArtifact {
   bool isBoolean = false;
   bool isDto = false;
   bool get isNullable => field.nullable;
-  bool get hasDefault => !(field.defaultValue is NoDefault);
+  bool get hasDefault => !(field.defaultValue is NoDefaultValue);
   dynamic get defaultValue => _toValue(field.defaultValue);
 
   FieldCodeArtifact(this.field) {
@@ -81,10 +81,13 @@ class FieldCodeArtifact {
   }
 
   _toValue(v) {
+    if (isNull(v)) return NullValue().toString();
     if (isString) return StringValue(v).toString();
-    if (v == null) return NullValue().toString();
     return v;
   }
+
+  static bool isNull(v) =>
+      v == null || v.toString().toLowerCase() == NullValue().toString();
 }
 
 class NullValue {

diff --git a/lib/parser.dart b/lib/parser.dart
@@ -171,8 +171,9 @@ class OpenApiParser {
         minimum: typeDef['minimum'],
         maximum: typeDef['maximum'],
         enumValues: typeDef['enum'],
-        defaultValue:
-            typeDef.containsKey('default') ? typeDef['default'] : NoDefault(),
+        defaultValue: typeDef.containsKey('default')
+            ? typeDef['default']
+            : NoDefaultValue(),
         nullable: typeDef['nullable'] ?? false);
 
     return field;

diff --git a/lib/types.dart b/lib/types.dart
@@ -60,8 +60,6 @@ class Field {
         defaultValue = defaultValue;
 }
 
-class NoDefault {}
-
 class SchemaType {
   final String key;
   final String name;
@@ -104,3 +102,5 @@ class ContainerType implements SchemaType {
   @override
   Field getField(String name) => _innerType.getField(name);
 }
+
+class NoDefaultValue {}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: valgene_cli
 description: Valgene (Validation Generator) generates validator and Dto boiler plate code from your OpenAPI specs.
-version: 1.0.10
+version: 1.0.11
 homepage: https://github.com/valgene/valgene-cli
 author: Sven Assmann <sven@d34dl0ck.me>
 

diff --git a/test/generator_test.dart b/test/generator_test.dart
@@ -44,6 +44,15 @@ void main() {
       expect(a.hasDefault, isTrue);
     });
 
+    test("string type with default value of null", () {
+      final a = FieldCodeArtifact(Field(
+          name: 'foo', type: OpenApiPrimitives.string, defaultValue: 'null'));
+
+      expect(a.isString, isTrue);
+      expect(a.defaultValue.toString(), equals('null'));
+      expect(a.hasDefault, isTrue);
+    });
+
     test("boolean", () {
       final a = FieldCodeArtifact(Field(
           name: 'foo', type: OpenApiPrimitives.boolean, defaultValue: false));
@@ -75,10 +84,10 @@ void main() {
       final a = FieldCodeArtifact(Field(
           name: 'foo',
           type: OpenApiPrimitives.number,
-          defaultValue: NoDefault()));
+          defaultValue: NoDefaultValue()));
 
       expect(a.isNumber, isTrue);
-      expect(a.defaultValue, TypeMatcher<NoDefault>());
+      expect(a.defaultValue, TypeMatcher<NoDefaultValue>());
       expect(a.hasDefault, isFalse);
     });
   });