Merge branch 'feat/add-linked-files' into develop

Author: JavedNicolas

lib/src/asset_loader.dart

@@ -35,24 +35,29 @@ class RootBundleAssetLoader extends AssetLoader {
   }
 
   Future<Map<String, dynamic>> _getLinkedTranslationFileDataFromBaseJson(
-      String basePath, Locale locale, Map<String, dynamic> baseJson) async {
-    Map<String, dynamic> fullJson = {};
+      String basePath, Locale locale, Map<String, dynamic> baseJson,
+      {List<String> fileLoaded = const []}) async {
+    Map<String, dynamic> fullJson = Map<String, dynamic>.from(baseJson);
 
     for (var entry in baseJson.entries) {
       var key = entry.key;
       var value = entry.value;
 
       if (value is String && value.startsWith(':/')) {
         String filePath = value.substring(2);
+
+        if (fileLoaded.contains(filePath)) {
+          throw Exception('Circular reference detected: $filePath is loaded multiple times');
+        }
+
+        fileLoaded.add(filePath);
         value = json.decode(await rootBundle.loadString(_getLinkedLocalePath(basePath, filePath, locale)));
       }
 
       if (value is Map<String, dynamic>) {
-        fullJson[key] = await _getLinkedTranslationFileDataFromBaseJson(basePath, locale, value);
-        continue;
+        fullJson[key] =
+            await _getLinkedTranslationFileDataFromBaseJson(basePath, locale, value, fileLoaded: fileLoaded);
       }
-
-      fullJson[key] = value;
     }
 
     return fullJson;
@@ -64,6 +69,6 @@ class RootBundleAssetLoader extends AssetLoader {
     EasyLocalization.logger.debug('Load asset from $path');
 
     Map<String, dynamic> baseJson = json.decode(await rootBundle.loadString(localePath));
-    return _getLinkedTranslationFileDataFromBaseJson(path, locale, baseJson);
+    return await _getLinkedTranslationFileDataFromBaseJson(path, locale, baseJson);
   }
 }

test/easy_localization_context_test.dart

@@ -87,9 +87,7 @@ void main() async {
             saveLocale: false,
             useOnlyLangCode: true,
             // fallbackLocale:Locale('en') ,
-            supportedLocales: const [
-              Locale('ar')
-            ], // Locale('en', 'US'), Locale('ar','DZ')
+            supportedLocales: const [Locale('ar')], // Locale('en', 'US'), Locale('ar','DZ')
             child: const MyApp(),
           ));
           // await tester.idle();
@@ -117,10 +115,7 @@ void main() async {
             await tester.pumpWidget(EasyLocalization(
               path: '../../i18n',
               // fallbackLocale:Locale('en') ,
-              supportedLocales: const [
-                Locale('en', 'US'),
-                Locale('ar', 'DZ')
-              ], // Locale('en', 'US'), Locale('ar','DZ')
+              supportedLocales: const [Locale('en', 'US'), Locale('ar', 'DZ')], // Locale('en', 'US'), Locale('ar','DZ')
               child: const MyApp(),
             ));
             // await tester.idle();
@@ -140,13 +135,10 @@ void main() async {
             await tester.pumpWidget(EasyLocalization(
               path: '../../i18n',
               // fallbackLocale:Locale('en') ,
-              supportedLocales: const [
-                Locale('en', 'US'),
-                Locale('ar', 'DZ')
-              ], // Locale('en', 'US'), Locale('ar','DZ')
+              supportedLocales: const [Locale('en', 'US'), Locale('ar', 'DZ')], // Locale('en', 'US'), Locale('ar','DZ')
               child: const MyApp(),
             ));
-            // await tester.idle();
+            await tester.idle();
             // The async delegator load will require build on the next frame. Thus, pump
             await tester.pump();
 
@@ -161,13 +153,10 @@ void main() async {
           await tester.runAsync(() async {
             await tester.pumpWidget(EasyLocalization(
               path: '../../i18n',
-              supportedLocales: const [
-                Locale('en', 'US'),
-                Locale('ar', 'DZ')
-              ], // Locale('en', 'US'), Locale('ar','DZ')
+              supportedLocales: const [Locale('en', 'US'), Locale('ar', 'DZ')], // Locale('en', 'US'), Locale('ar','DZ')
               child: const MyApp(),
             ));
-            // await tester.idle();
+            await tester.idle();
             // The async delegator load will require build on the next frame. Thus, pump
             await tester.pump();
 
@@ -182,10 +171,7 @@ void main() async {
           await tester.runAsync(() async {
             await tester.pumpWidget(EasyLocalization(
               path: '../../i18n',
-              supportedLocales: const [
-                Locale('en', 'US'),
-                Locale('ar', 'DZ')
-              ], // Locale('en', 'US'), Locale('ar','DZ')
+              supportedLocales: const [Locale('en', 'US'), Locale('ar', 'DZ')], // Locale('en', 'US'), Locale('ar','DZ')
               startLocale: const Locale('ar', 'DZ'),
               child: const MyApp(),
             ));
@@ -208,10 +194,7 @@ void main() async {
           await tester.runAsync(() async {
             await tester.pumpWidget(EasyLocalization(
               path: '../../i18n',
-              supportedLocales: const [
-                Locale('en', 'US'),
-                Locale('ar', 'DZ')
-              ], // Locale('en', 'US'), Locale('ar','DZ')
+              supportedLocales: const [Locale('en', 'US'), Locale('ar', 'DZ')], // Locale('en', 'US'), Locale('ar','DZ')
               child: const MyApp(),
             ));
             await tester.idle();
@@ -229,10 +212,7 @@ void main() async {
           await tester.runAsync(() async {
             await tester.pumpWidget(EasyLocalization(
               path: '../../i18n',
-              supportedLocales: const [
-                Locale('en', 'US'),
-                Locale('ar', 'DZ')
-              ], // Locale('en', 'US'), Locale('ar','DZ')
+              supportedLocales: const [Locale('en', 'US'), Locale('ar', 'DZ')], // Locale('en', 'US'), Locale('ar','DZ')
               startLocale: const Locale('ar', 'DZ'),
               child: const MyApp(),
             ));