Encode maps in lists as non-null maps

axel-op · axel-op · commit 71cd57f9fd5b · 2020-03-11T23:51:34.000+01:00
diff --git a/lib/src/common/misc_service.dart b/lib/src/common/misc_service.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
 import 'package:github/src/common.dart';
 import 'package:github/src/json.dart';
 
diff --git a/lib/src/json.dart b/lib/src/json.dart
@@ -16,7 +16,12 @@ class GitHubJson {
   static String encode(Object object, {String indent}) {
     final encoder = JsonEncoder.withIndent(indent, _toEncodable);
     if (object is Map) {
-      object = createNonNullMap(object);
+      object = createNonNullMap(object as Map, recursive: true);
+    }
+    if (object is List) {
+      object = (object as List)
+          .map((e) => e is Map ? createNonNullMap(e, recursive: true) : e)
+          .toList();
     }
     return encoder.convert(object);
   }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import 'dart:async';`
`2`		`-import 'dart:convert';`
`3`	`2`	`import 'package:github/src/common.dart';`
`4`	`3`	`import 'package:github/src/json.dart';`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,12 @@ class GitHubJson {`
`16`	`16`	`static String encode(Object object, {String indent}) {`
`17`	`17`	`final encoder = JsonEncoder.withIndent(indent, _toEncodable);`
`18`	`18`	`if (object is Map) {`
`19`		`- object = createNonNullMap(object);`
	`19`	`+ object = createNonNullMap(object as Map, recursive: true);`
	`20`	`+ }`
	`21`	`+ if (object is List) {`
	`22`	`+ object = (object as List)`
	`23`	`+ .map((e) => e is Map ? createNonNullMap(e, recursive: true) : e)`
	`24`	`+ .toList();`
`20`	`25`	`}`
`21`	`26`	`return encoder.convert(object);`
`22`	`27`	`}`