gocal · kirill09 · Jan 29, 2021 · Jun 13, 2021 · Jun 13, 2021
diff --git a/bin/import.dart b/bin/import.dart
@@ -16,8 +16,8 @@ import 'package:gsheet_to_arb/src/utils/log.dart';
 void main(List<String> args) async {
   var parser = ArgParser();
 
-  bool showHelp;
-  bool createConfig;
+  var showHelp = false;
+  var createConfig = false;
 
   parser.addFlag('help',
       negatable: false,
@@ -59,29 +59,31 @@ void main(List<String> args) async {
 
 void _checkAuthConfig(GoogleSheetConfig config) {
   final placeholder = 'TODO';
+  final auth = config.auth;
 
-  if (config.auth == null) {
+  if (auth == null) {
     Log.i(
         'Authetnication config not found - please add config to ${config.authFile} file');
     exit(1);
   }
 
-  final auth = config.auth;
+  final oauthClientId = auth.oauthClientId;
+  final serviceAccountKey = auth.serviceAccountKey;
 
-  if (auth.oauthClientId == null && auth.serviceAccountKey == null) {
+  if (oauthClientId == null && serviceAccountKey == null) {
     Log.i(
         'Authetnication config is invalid - please add config to ${config.authFile} file');
     exit(1);
   }
 
-  if (auth.oauthClientId != null) {
-    if (auth.oauthClientId.clientId == placeholder ||
-        auth.oauthClientId.clientSecret == placeholder) {
+  if (oauthClientId != null) {
+    if (oauthClientId.clientId == placeholder ||
+        oauthClientId.clientSecret == placeholder) {
       Log.i('Please use valid auth client configuration');
       exit(1);
     }
-  } else if (auth.serviceAccountKey != null) {
-    if (auth.serviceAccountKey.privateKey == placeholder) {
+  } else if (serviceAccountKey != null) {
+    if (serviceAccountKey.privateKey == placeholder) {
       Log.i('Please use valid auth server configuration');
       exit(1);
     }

diff --git a/example/lib/l10n/_messages_de.dart b/example/lib/l10n/_messages_de.dart
@@ -19,26 +19,30 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'de';
 
-  static m0(count) => "${Intl.plural(count, one: '${count} kanadische Dollar', other: '${count} kanadischen Dollar')}";
+  static String m0(count) =>
+      "${Intl.plural(count, one: '${count} kanadische Dollar', other: '${count} kanadischen Dollar')}";
 
-  static m1(count) => "${Intl.plural(count, zero: 'Keine Lieder gefunden.', one: 'Ein Lied gefunden.', two: '${count} Songs gefunden.', few: '${count} Songs gefunden.', many: '${count} Songs gefunden.', other: '${count} Lied gefunden.')}";
+  static String m1(count) =>
+      "${Intl.plural(count, zero: 'Keine Lieder gefunden.', one: 'Ein Lied gefunden.', two: '${count} Songs gefunden.', few: '${count} Songs gefunden.', many: '${count} Songs gefunden.', other: '${count} Lied gefunden.')}";
 
-  static m2(name) => "Einzel ${name} Argument";
+  static String m2(name) => "Einzel ${name} Argument";
 
-  static m3(first, second) => "Dwa argumenty: ${first} i ${second}";
+  static String m3(first, second) => "Dwa argumenty: ${first} i ${second}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static _notInlinedMessages(_) => <String, Function> {
-    "amountDollars" : m0,
-    "appName" : MessageLookupByLibrary.simpleMessage("Anwendung"),
-    "login" : MessageLookupByLibrary.simpleMessage("Einloggen"),
-    "longText" : MessageLookupByLibrary.simpleMessage("Linie ein\nLinie b\nLinie c\nlorem\nipsum"),
-    "message" : MessageLookupByLibrary.simpleMessage("Nachricht"),
-    "numberOfSongsAvailable" : m1,
-    "register" : MessageLookupByLibrary.simpleMessage("Registrieren"),
-    "singleArgument" : m2,
-    "specialCharacters" : MessageLookupByLibrary.simpleMessage("special: äöüß"),
-    "title" : MessageLookupByLibrary.simpleMessage("Titel"),
-    "twoArguments" : m3
-  };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
+        "amountDollars": m0,
+        "appName": MessageLookupByLibrary.simpleMessage("Anwendung"),
+        "login": MessageLookupByLibrary.simpleMessage("Einloggen"),
+        "longText": MessageLookupByLibrary.simpleMessage(
+            "Linie ein\nLinie b\nLinie c\nlorem\nipsum"),
+        "message": MessageLookupByLibrary.simpleMessage("Nachricht"),
+        "numberOfSongsAvailable": m1,
+        "register": MessageLookupByLibrary.simpleMessage("Registrieren"),
+        "singleArgument": m2,
+        "specialCharacters":
+            MessageLookupByLibrary.simpleMessage("special: äöüß"),
+        "title": MessageLookupByLibrary.simpleMessage("Titel"),
+        "twoArguments": m3
+      };
 }
diff --git a/example/lib/l10n/_messages_en.dart b/example/lib/l10n/_messages_en.dart
@@ -19,26 +19,30 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'en';
 
-  static m0(count) => "${Intl.plural(count, one: '${count} Canadian dollar', other: '${count} Canadian dollars')}";
+  static String m0(count) =>
+      "${Intl.plural(count, one: '${count} Canadian dollar', other: '${count} Canadian dollars')}";
 
-  static m1(count) => "${Intl.plural(count, zero: 'No songs found.', one: 'One song found.', two: '${count} songs found.', few: '${count} songs found.', many: '${count} songs found.', other: '${count} song found.')}";
+  static String m1(count) =>
+      "${Intl.plural(count, zero: 'No songs found.', one: 'One song found.', two: '${count} songs found.', few: '${count} songs found.', many: '${count} songs found.', other: '${count} song found.')}";
 
-  static m2(name) => "Single ${name} argument";
+  static String m2(name) => "Single ${name} argument";
 
-  static m3(first, second) => "Argument ${first} and ${second}";
+  static String m3(first, second) => "Argument ${first} and ${second}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static _notInlinedMessages(_) => <String, Function> {
-    "amountDollars" : m0,
-    "appName" : MessageLookupByLibrary.simpleMessage("Sample Application"),
-    "login" : MessageLookupByLibrary.simpleMessage("Login"),
-    "longText" : MessageLookupByLibrary.simpleMessage("line a\nline b\nline c\nlorem\nipsum"),
-    "message" : MessageLookupByLibrary.simpleMessage("Message"),
-    "numberOfSongsAvailable" : m1,
-    "register" : MessageLookupByLibrary.simpleMessage("Register"),
-    "singleArgument" : m2,
-    "specialCharacters" : MessageLookupByLibrary.simpleMessage("special: !@#\$%^&*()"),
-    "title" : MessageLookupByLibrary.simpleMessage("Title"),
-    "twoArguments" : m3
-  };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
+        "amountDollars": m0,
+        "appName": MessageLookupByLibrary.simpleMessage("Sample Application"),
+        "login": MessageLookupByLibrary.simpleMessage("Login"),
+        "longText": MessageLookupByLibrary.simpleMessage(
+            "line a\nline b\nline c\nlorem\nipsum"),
+        "message": MessageLookupByLibrary.simpleMessage("Message"),
+        "numberOfSongsAvailable": m1,
+        "register": MessageLookupByLibrary.simpleMessage("Register"),
+        "singleArgument": m2,
+        "specialCharacters":
+            MessageLookupByLibrary.simpleMessage("special: !@#\$%^&*()"),
+        "title": MessageLookupByLibrary.simpleMessage("Title"),
+        "twoArguments": m3
+      };
 }
diff --git a/example/lib/l10n/_messages_pl.dart b/example/lib/l10n/_messages_pl.dart
@@ -19,26 +19,30 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'pl';
 
-  static m0(count) => "${Intl.plural(count, one: '${count} dolar kanadyjski', other: '${count} dolarów kanadyjskich')}";
+  static String m0(count) =>
+      "${Intl.plural(count, one: '${count} dolar kanadyjski', other: '${count} dolarów kanadyjskich')}";
 
-  static m1(count) => "${Intl.plural(count, zero: 'Nie znaleziono piosenek.', one: 'Znaleziono jedną piosenkę.', two: 'Znaleziono ${count} piosenki.', few: 'Znaleziono ${count} piosenek.', many: 'Znaleziono ${count} piosenek.', other: 'Znaleziono ${count} piosenek.')}";
+  static String m1(count) =>
+      "${Intl.plural(count, zero: 'Nie znaleziono piosenek.', one: 'Znaleziono jedną piosenkę.', two: 'Znaleziono ${count} piosenki.', few: 'Znaleziono ${count} piosenek.', many: 'Znaleziono ${count} piosenek.', other: 'Znaleziono ${count} piosenek.')}";
 
-  static m2(name) => "Pojedynczy argument  ${name} ";
+  static String m2(name) => "Pojedynczy argument  ${name} ";
 
-  static m3(first, second) => "Dwa argumenty: ${first} i ${second}";
+  static String m3(first, second) => "Dwa argumenty: ${first} i ${second}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static _notInlinedMessages(_) => <String, Function> {
-    "amountDollars" : m0,
-    "appName" : MessageLookupByLibrary.simpleMessage("Aplikacja"),
-    "login" : MessageLookupByLibrary.simpleMessage("Zaloguj"),
-    "longText" : MessageLookupByLibrary.simpleMessage("lina a\nlina b\nlina c\nlorem\nipsum"),
-    "message" : MessageLookupByLibrary.simpleMessage("Wiadomość"),
-    "numberOfSongsAvailable" : m1,
-    "register" : MessageLookupByLibrary.simpleMessage("Zarejestruj"),
-    "singleArgument" : m2,
-    "specialCharacters" : MessageLookupByLibrary.simpleMessage("special: ąęśćż"),
-    "title" : MessageLookupByLibrary.simpleMessage("Tytuł"),
-    "twoArguments" : m3
-  };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
+        "amountDollars": m0,
+        "appName": MessageLookupByLibrary.simpleMessage("Aplikacja"),
+        "login": MessageLookupByLibrary.simpleMessage("Zaloguj"),
+        "longText": MessageLookupByLibrary.simpleMessage(
+            "lina a\nlina b\nlina c\nlorem\nipsum"),
+        "message": MessageLookupByLibrary.simpleMessage("Wiadomość"),
+        "numberOfSongsAvailable": m1,
+        "register": MessageLookupByLibrary.simpleMessage("Zarejestruj"),
+        "singleArgument": m2,
+        "specialCharacters":
+            MessageLookupByLibrary.simpleMessage("special: ąęśćż"),
+        "title": MessageLookupByLibrary.simpleMessage("Tytuł"),
+        "twoArguments": m3
+      };
 }
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -2,17 +2,16 @@ name: gsheet_to_arb_example
 description: Example of how to use ghseet_to_arb plugin
 
 environment:
-  sdk: '>=2.0.0 <3.0.0'
+  sdk: '>=2.0.1 <3.0.0'
 
 dependencies:
-  intl:
-  intl_translation: ^0.17.9
+  intl: any
 
 dev_dependencies:
-  gsheet_to_arb: ^0.1.8
-#    path: ../
-  test: ^1.5.3
-  mockito: ^4.0.0  
+  gsheet_to_arb: #^0.1.8
+   path: ../
+  test: any
+  mockito: any
 
 gsheet_to_arb: 
   arb_file_prefix: 'intl'

diff --git a/lib/src/arb/arb.dart b/lib/src/arb/arb.dart
@@ -5,17 +5,22 @@
  */
 
 class ArbDocument {
-  String locale;
-  DateTime lastModified;
-  List<ArbResource> entries;
+  String? locale;
+  DateTime? lastModified;
+  List<ArbResource> entries = <ArbResource>[];
 
   ArbDocument(this.locale, this.lastModified, this.entries);
 
   Map<String, Object> toJson({bool compact = false}) {
     final json = <String, Object>{};
 
-    json['@@locale'] = locale;
-    json['@@last_modified'] = lastModified.toIso8601String();
+    if (locale != null) {
+      json['@@locale'] = locale!;
+    }
+
+    if (lastModified != null) {
+      json['@@last_modified'] = lastModified!.toIso8601String();
+    }
 
     entries.forEach((ArbResource resource) {
       json[resource.key] = resource.value;
@@ -38,7 +43,7 @@ class ArbDocument {
         lastModified = DateTime.parse(value);
       } else if (key.startsWith('@')) {
         var entry = entriesMap[key.substring(2)];
-        entry.attributes.addAll(value);
+        entry?.attributes.addAll(value);
       } else {
         var entry = ArbResource(key, value);
         entries.add(entry);
@@ -52,9 +57,9 @@ class ArbResource {
   final String key;
   final String value;
   final Map<String, Object> attributes = {};
-  final List<ArbResourcePlaceholder> placeholders;
-  final String description;
-  final String context;
+  final List<ArbResourcePlaceholder>? placeholders;
+  final String? description;
+  final String? context;
 
   ArbResource(String key, String value,
       {this.description = '', this.context = '', this.placeholders = const []})
@@ -63,16 +68,16 @@ class ArbResource {
     // Possible values are "text", "image", "css"
     attributes['type'] = 'Text';
 
-    if (placeholders != null && placeholders.isNotEmpty) {
-      attributes['placeholders'] = _formatPlaceholders(placeholders);
+    if (placeholders != null && placeholders!.isNotEmpty) {
+      attributes['placeholders'] = _formatPlaceholders(placeholders!);
     }
 
-    if (description != null && description.isNotEmpty) {
-      attributes['description'] = description;
+    if (description != null && description!.isNotEmpty) {
+      attributes['description'] = description!;
     }
 
-    if (context != null && context.isNotEmpty) {
-      attributes['context'] = context;
+    if (context != null && context!.isNotEmpty) {
+      attributes['context'] = context!;
     }
   }
 
@@ -82,9 +87,7 @@ class ArbResource {
 
     placeholders.forEach((placeholder) {
       final placeholderArgs = <String, Object>{};
-      if (placeholder.type != null) {
-        placeholderArgs['type'] = placeholder.type;
-      }
+      placeholderArgs['type'] = placeholder.type;
       map[placeholder.name] = placeholderArgs;
     });
     return map;
@@ -97,12 +100,12 @@ class ArbResourcePlaceholder {
 
   final String name;
   final String type;
-  final String description;
-  final String example;
+  final String? description;
+  final String? example;
 
   ArbResourcePlaceholder({
-    this.name,
-    this.type,
+    required this.name,
+    required this.type,
     this.description,
     this.example,
   });