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

Author: JavedNicolas

bin/audit/audit_command.dart

@@ -5,7 +5,7 @@ import 'package:path/path.dart';
 import 'package:easy_localization/src/file_loaders/io_file_loader.dart';
 
 class AuditCommand {
-  void run({required String transDir, required String srcDir}) async {
+  Future<void> run({required String transDir, required String srcDir}) async {
     try {
       final translationDir = Directory(transDir);
       final sourceDir = Directory(srcDir);

example/lib/generated/codegen_loader.g.dart

@@ -8,7 +8,10 @@ import 'package:easy_localization/easy_localization.dart'
     show AssetLoader, JsonLinkedFileResolver, RootBundleFileLoader;
 
 class CodegenLoader extends AssetLoader {
-  const CodegenLoader() : super(linkedFileResolver: const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()));
+  const CodegenLoader()
+      : super(
+            linkedFileResolver: const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()),
+            fileLoader: const RootBundleFileLoader());
 
   @override
   Future<Map<String, dynamic>> load(String fullPath, Locale locale) {

lib/src/asset_loader.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:ui';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:easy_localization/src/file_loaders/file_loader.dart';
 import 'package:easy_localization/src/file_loaders/io_file_loader.dart';
-import 'package:flutter/services.dart';
 
 /// abstract class used to building your Custom AssetLoader
 /// Example:
@@ -17,9 +17,10 @@ import 'package:flutter/services.dart';
 /// ```
 abstract class AssetLoader {
   // Place inside class RootBundleAssetLoader
+  final FileLoader fileLoader;
   final LinkedFileResolver linkedFileResolver;
 
-  const AssetLoader({required this.linkedFileResolver});
+  const AssetLoader({required this.linkedFileResolver, required this.fileLoader});
 
   Future<Map<String, dynamic>?> load(String path, Locale locale);
 }
@@ -28,13 +29,20 @@ abstract class AssetLoader {
 /// default used is RootBundleAssetLoader which uses flutter's assetloader
 ///
 class RootBundleAssetLoader extends AssetLoader {
-  const RootBundleAssetLoader({LinkedFileResolver? linkedFileResolver})
-      : super(
-            linkedFileResolver: linkedFileResolver ?? const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()));
+  const RootBundleAssetLoader({required LinkedFileResolver linkedFileResolver, required FileLoader fileLoader})
+      : super(linkedFileResolver: linkedFileResolver, fileLoader: fileLoader);
+
+  factory RootBundleAssetLoader.fromRootBundle() {
+    return const RootBundleAssetLoader(
+      linkedFileResolver: JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()),
+      fileLoader: RootBundleFileLoader(),
+    );
+  }
 
   factory RootBundleAssetLoader.fromIOFile() {
     return const RootBundleAssetLoader(
       linkedFileResolver: JsonLinkedFileResolver(fileLoader: IOFileLoader()),
+      fileLoader: IOFileLoader(),
     );
   }
 
@@ -47,7 +55,7 @@ class RootBundleAssetLoader extends AssetLoader {
     var localePath = getLocalePath(path, locale);
     EasyLocalization.logger.debug('Load asset from $path');
 
-    Map<String, dynamic> baseJson = json.decode(await linkedFileResolver.fileLoader.loadString(localePath));
+    Map<String, dynamic> baseJson = json.decode(await fileLoader.loadString(localePath));
     return await linkedFileResolver.resolveLinkedFiles(
       basePath: path,
       languageCode: locale.languageCode,

lib/src/easy_localization_app.dart

@@ -137,7 +137,10 @@ class EasyLocalization extends StatefulWidget {
     this.useFallbackTranslations = false,
     this.useFallbackTranslationsForEmptyResources = false,
     this.ignorePluralRules = true,
-    this.assetLoader = const RootBundleAssetLoader(),
+    this.assetLoader = const RootBundleAssetLoader(
+      fileLoader: RootBundleFileLoader(),
+      linkedFileResolver: JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()),
+    ),
     this.extraAssetLoaders,
     this.saveLocale = true,
     this.errorWidget,

lib/src/linked_file_resolver.dart

@@ -87,7 +87,7 @@ class JsonLinkedFileResolver extends LinkedFileResolver {
           languageCode: languageCode,
           baseJson: value,
           visited: visited,
-          depth: depth + 1,
+          depth: depth,
           countryCode: countryCode,
         );
       }

test/easy_localization_extra_asset_loaders_test.dart

@@ -29,8 +29,7 @@ void main() {
       expect(result.entries.length, 1);
     });
 
-    test('load assets from external loader and merge with asset loader',
-        () async {
+    test('load assets from external loader and merge with asset loader', () async {
       final EasyLocalizationController controller = EasyLocalizationController(
         forceLocale: const Locale('en'),
         path: 'path/en.json',
@@ -42,11 +41,10 @@ void main() {
           log(e.toString());
         },
         assetLoader: const ImmutableJsonAssetLoader(),
-        extraAssetLoaders: [const ExternalAssetLoader()],
+        extraAssetLoaders: [ExternalAssetLoader()],
       );
 
-      final Map<String, dynamic> result =
-          await controller.loadTranslationData(const Locale('en'));
+      final Map<String, dynamic> result = await controller.loadTranslationData(const Locale('en'));
 
       expect(result, {
         'test': 'test',
@@ -57,9 +55,7 @@ void main() {
       expect(result.entries.length, 4);
     });
 
-    test(
-        'load assets from external loader with nested translations and merge with asset loader',
-        () async {
+    test('load assets from external loader with nested translations and merge with asset loader', () async {
       final EasyLocalizationController controller = EasyLocalizationController(
         forceLocale: const Locale('en'),
         path: 'path/en.json',
@@ -71,11 +67,10 @@ void main() {
           log(e.toString());
         },
         assetLoader: const ImmutableJsonAssetLoader(),
-        extraAssetLoaders: [const NestedAssetLoader()],
+        extraAssetLoaders: [NestedAssetLoader()],
       );
 
-      final Map<String, dynamic> result =
-          await controller.loadTranslationData(const Locale('en'));
+      final Map<String, dynamic> result = await controller.loadTranslationData(const Locale('en'));
 
       expect(result, {
         'test': 'test',
@@ -90,9 +85,7 @@ void main() {
       expect(result.entries.length, 2);
     });
 
-    test(
-        'load assets from external loader and merge duplicates with asset loader',
-        () async {
+    test('load assets from external loader and merge duplicates with asset loader', () async {
       final EasyLocalizationController controller = EasyLocalizationController(
         forceLocale: const Locale('en'),
         path: 'path/en.json',
@@ -107,8 +100,7 @@ void main() {
         extraAssetLoaders: [const ImmutableJsonAssetLoader()],
       );
 
-      final Map<String, dynamic> result =
-          await controller.loadTranslationData(const Locale('en'));
+      final Map<String, dynamic> result = await controller.loadTranslationData(const Locale('en'));
 
       expect(result, {'test': 'test'});
       expect(result.entries.length, 1);

test/easy_localization_widget_test.dart

@@ -116,7 +116,7 @@ void main() async {
       await tester.runAsync(() async {
         await tester.pumpWidget(EasyLocalization(
           path: '../../i18n',
-          assetLoader: const RootBundleAssetLoader(),
+          assetLoader: RootBundleAssetLoader.fromRootBundle(),
           supportedLocales: const [Locale('en', 'US')],
           child: const MyApp(),
         ));

test/utils/test_asset_loaders.dart

@@ -5,7 +5,9 @@ import 'package:easy_localization/easy_localization.dart'
 
 class ImmutableJsonAssetLoader extends AssetLoader {
   const ImmutableJsonAssetLoader()
-      : super(linkedFileResolver: const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()));
+      : super(
+            linkedFileResolver: const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()),
+            fileLoader: const RootBundleFileLoader());
 
   @override
   Future<Map<String, dynamic>> load(String fullPath, Locale locale) {
@@ -16,7 +18,10 @@ class ImmutableJsonAssetLoader extends AssetLoader {
 }
 
 class JsonAssetLoader extends AssetLoader {
-  const JsonAssetLoader() : super(linkedFileResolver: const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()));
+  const JsonAssetLoader()
+      : super(
+            linkedFileResolver: const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()),
+            fileLoader: const RootBundleFileLoader());
 
   @override
   Future<Map<String, dynamic>> load(String fullPath, Locale locale) {
@@ -138,8 +143,10 @@ class JsonAssetLoader extends AssetLoader {
 }
 
 class ExternalAssetLoader extends AssetLoader {
-  const ExternalAssetLoader()
-      : super(linkedFileResolver: const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()));
+  ExternalAssetLoader()
+      : super(
+            linkedFileResolver: const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()),
+            fileLoader: const RootBundleFileLoader());
 
   @override
   Future<Map<String, dynamic>> load(String fullPath, Locale locale) => Future.value(const {
@@ -150,8 +157,10 @@ class ExternalAssetLoader extends AssetLoader {
 }
 
 class NestedAssetLoader extends AssetLoader {
-  const NestedAssetLoader()
-      : super(linkedFileResolver: const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()));
+  NestedAssetLoader()
+      : super(
+            linkedFileResolver: const JsonLinkedFileResolver(fileLoader: RootBundleFileLoader()),
+            fileLoader: const RootBundleFileLoader());
 
   @override
   Future<Map<String, dynamic>> load(String fullPath, Locale locale) => Future.value({