draft

Author: lcdsmao

example/lib/freezed_sample.freezed.dart

@@ -216,7 +216,7 @@ class _$Data with DiagnosticableTreeMixin implements Data {
 abstract class Data implements Union {
   const factory Data(final int value) = _$Data;
 
-  int get value => throw _privateConstructorUsedError;
+  int get value;
   @JsonKey(ignore: true)
   _$$DataCopyWith<_$Data> get copyWith => throw _privateConstructorUsedError;
 }
@@ -476,7 +476,7 @@ class _$ErrorDetails with DiagnosticableTreeMixin implements ErrorDetails {
 abstract class ErrorDetails implements Union {
   const factory ErrorDetails([final String? message]) = _$ErrorDetails;
 
-  String? get message => throw _privateConstructorUsedError;
+  String? get message;
   @JsonKey(ignore: true)
   _$$ErrorDetailsCopyWith<_$ErrorDetails> get copyWith =>
       throw _privateConstructorUsedError;

example/pubspec.yaml

@@ -41,7 +41,6 @@ dependencies:
   local_auth: 2.0.1
   flutter_hooks: 0.18.3
   hooks_riverpod: 1.0.3
-  async: 2.8.2
   dio: 4.0.6
   connectivity_plus: 2.3.0
   ua_client_hints: 1.1.0
@@ -51,7 +50,7 @@ dependencies:
   protobuf: 2.0.1
   json_serializable: 6.2.0
   json_annotation: ^4.5.0
-  freezed_annotation: 2.0.1
+  freezed_annotation: ^2.1.0
   intl: 0.17.0
   fixnum: 1.0.0
   shared_preferences: 2.0.13
@@ -107,6 +106,7 @@ dev_dependencies:
   integration_test:
     sdk: flutter
   build_runner: ^2.1.11
+  freezed: ^2.1.0+1
   flutter_gen_runner: ^4.3.0
 
   flutter_lints: ^2.0.1

packages/core/lib/flutter_generator.dart

@@ -7,11 +7,10 @@ import 'generators/assets_generator.dart';
 import 'generators/colors_generator.dart';
 import 'generators/fonts_generator.dart';
 import 'settings/config.dart';
-import 'utils/error.dart';
 import 'utils/file.dart';
 
 class FlutterGenerator {
-  const FlutterGenerator(
+  FlutterGenerator(
     this.pubspecFile, {
     this.assetsName = 'assets.gen.dart',
     this.colorsName = 'colors.gen.dart',
@@ -23,32 +22,25 @@ class FlutterGenerator {
   final String colorsName;
   final String fontsName;
 
-  Future<Config?> getConfig() async {
-    Config config;
-
-    try {
-      config = await loadPubspecConfig(pubspecFile);
-    } on InvalidSettingsException catch (e) {
-      stderr.writeln(e.message);
-      return null;
-    } on FileSystemException catch (e) {
-      stderr.writeln(e.message);
-      return null;
-    }
-
-    return config;
-  }
-
-  Future<void> build({Config? config}) async {
-    config ??= await getConfig();
-    if (config == null) return;
+  Future<void> build({Config? config, FileWriter? writer}) async {
+    config ??= loadPubspecConfig(pubspecFile);
 
     final flutter = config.pubspec.flutter;
     final flutterGen = config.pubspec.flutterGen;
     final output = config.pubspec.flutterGen.output;
     final lineLength = config.pubspec.flutterGen.lineLength;
     final formatter = DartFormatter(pageWidth: lineLength, lineEnding: '\n');
 
+    void defaultWriter(String contents, String path) {
+      final file = File(path);
+      if (!file.existsSync()) {
+        file.createSync(recursive: true);
+      }
+      file.writeAsStringSync(contents);
+    }
+
+    writer ??= defaultWriter;
+
     final absoluteOutput =
         Directory(normalize(join(pubspecFile.parent.path, output)));
     if (!absoluteOutput.existsSync()) {
@@ -58,29 +50,29 @@ class FlutterGenerator {
     if (flutterGen.colors.enabled && flutterGen.colors.inputs.isNotEmpty) {
       final generated =
           generateColors(pubspecFile, formatter, flutterGen.colors);
-      final colors =
-          File(normalize(join(pubspecFile.parent.path, output, colorsName)));
-      writeAsString(generated, file: colors);
-      stdout.writeln('Generated: ${colors.absolute.path}');
+      final colorsPath =
+          normalize(join(pubspecFile.parent.path, output, colorsName));
+      writer(generated, colorsPath);
+      stdout.writeln('Generated: $colorsPath');
     }
 
     if (flutterGen.assets.enabled && flutter.assets.isNotEmpty) {
       final generated = generateAssets(
         AssetsGenConfig.fromConfig(pubspecFile, config),
         formatter,
       );
-      final assets =
-          File(normalize(join(pubspecFile.parent.path, output, assetsName)));
-      writeAsString(generated, file: assets);
-      stdout.writeln('Generated: ${assets.absolute.path}');
+      final assetsPath =
+          normalize(join(pubspecFile.parent.path, output, assetsName));
+      writer(generated, assetsPath);
+      stdout.writeln('Generated: $assetsPath');
     }
 
     if (flutterGen.fonts.enabled && flutter.fonts.isNotEmpty) {
       final generated = generateFonts(formatter, flutter.fonts);
-      final fonts =
-          File(normalize(join(pubspecFile.parent.path, output, fontsName)));
-      writeAsString(generated, file: fonts);
-      stdout.writeln('Generated: ${fonts.absolute.path}');
+      final fontsPath =
+          normalize(join(pubspecFile.parent.path, output, fontsName));
+      writer(generated, fontsPath);
+      stdout.writeln('Generated: $fontsPath');
     }
 
     stdout.writeln('FlutterGen finished.');

packages/core/lib/settings/config.dart

@@ -14,16 +14,19 @@ class Config {
   final File pubspecFile;
 }
 
-Future<Config> loadPubspecConfig(File pubspecFile) async {
+Config loadPubspecConfig(File pubspecFile) {
   stdout.writeln('$flutterGenVersion Loading ... '
       '${normalize(join(
     basename(pubspecFile.parent.path),
     basename(pubspecFile.path),
   ))}');
-  final content = await pubspecFile.readAsString().catchError((dynamic error) {
+  final String content;
+  try {
+    content = pubspecFile.readAsStringSync();
+  } catch (e) {
     throw FileSystemException(
         'Cannot open pubspec.yaml: ${pubspecFile.absolute}');
-  });
+  }
   final userMap = loadYaml(content) as Map?;
   final defaultMap = loadYaml(_defaultConfig) as Map?;
   final mergedMap = mergeMap([defaultMap, userMap]);

packages/core/lib/utils/file.dart

@@ -1,8 +1 @@
-import 'dart:io';
-
-void writeAsString(String text, {required File file}) {
-  if (!file.existsSync()) {
-    file.createSync(recursive: true);
-  }
-  file.writeAsStringSync(text);
-}
+typedef FileWriter = void Function(String contents, String path);

packages/core/test/assets_gen_test.dart

@@ -55,7 +55,7 @@ void main() {
 
     test('Assets with No lists on pubspec.yaml', () async {
       final pubspec = File('test_resources/pubspec_assets_no_list.yaml');
-      final config = await loadPubspecConfig(pubspec);
+      final config = loadPubspecConfig(pubspec);
       final formatter = DartFormatter(
           pageWidth: config.pubspec.flutterGen.lineLength, lineEnding: '\n');
 

packages/runner/build.yaml

@@ -8,6 +8,6 @@ builders:
   flutter_gen_runner:
     import: "package:flutter_gen_runner/flutter_gen_runner.dart"
     builder_factories: [ "build" ]
-    build_extensions: { "$package$": [ ".gen.dart" ] }
+    build_extensions: { "$package$": [ "lib/gen/assets.gen.dart", "lib/gen/colors.gen.dart" ] }
     auto_apply: dependents
     build_to: source

packages/runner/lib/flutter_gen_runner.dart

@@ -8,32 +8,55 @@ import 'package:flutter_gen_core/flutter_generator.dart';
 import 'package:flutter_gen_core/settings/config.dart';
 
 import 'package:glob/glob.dart';
+import 'package:path/path.dart';
 
 Builder build(BuilderOptions options) => FlutterGenBuilder();
 
 class FlutterGenBuilder extends Builder {
+  static AssetId _output(BuildStep buildStep, String path) {
+    return AssetId(
+      buildStep.inputId.package,
+      path,
+    );
+  }
+
   final FlutterGenerator generator = FlutterGenerator(File('pubspec.yaml'));
+  late final _config = loadPubspecConfig(generator.pubspecFile);
   _FlutterGenBuilderState? _currentState;
 
   @override
   Future<void> build(BuildStep buildStep) async {
-    final config = await generator.getConfig();
-    if (config == null) return;
-
-    final state = await _createState(config, buildStep);
-    if (_currentState != null && _currentState!.equals(state)) return;
+    final state = await _createState(_config, buildStep);
+    if (state.shouldSkipGenerate(_currentState)) return;
     _currentState = state;
 
-    await generator.build(config: config);
+    await generator.build(
+      config: _config,
+      writer: (contents, path) {
+        buildStep.writeAsString(_output(buildStep, path), contents);
+      },
+    );
   }
 
   @override
-  Map<String, List<String>> get buildExtensions => {
-        "\$package\$": ['.gen.dart']
-      };
+  Map<String, List<String>> get buildExtensions {
+    final ouput = _config.pubspec.flutterGen.output;
+    final map = {
+      r'$package$': [
+        for (final name in [
+          generator.assetsName,
+          generator.colorsName,
+          generator.fontsName
+        ])
+          join(ouput, name),
+      ],
+    };
+    return map;
+  }
 
   Future<_FlutterGenBuilderState> _createState(
       Config config, BuildStep buildStep) async {
+    print('aaa ${buildStep.inputId}');
     final pubspec = config.pubspec;
 
     final HashSet<String> assets = HashSet();
@@ -63,7 +86,11 @@ class FlutterGenBuilder extends Builder {
 
     final pubspecDigest = await buildStep.digest(pubspecAsset);
 
-    return _FlutterGenBuilderState(pubspecDigest, assets, colors);
+    return _FlutterGenBuilderState(
+      pubspecDigest: pubspecDigest,
+      assets: assets,
+      colors: colors,
+    );
   }
 }
 
@@ -72,11 +99,17 @@ class _FlutterGenBuilderState {
   final HashSet<String> assets;
   final HashMap<String, Digest> colors;
 
-  _FlutterGenBuilderState(this.pubspecDigest, this.assets, this.colors);
-
-  bool equals(_FlutterGenBuilderState state) {
-    return pubspecDigest == state.pubspecDigest &&
-        const SetEquality().equals(assets, state.assets) &&
-        const MapEquality().equals(colors, state.colors);
+  _FlutterGenBuilderState({
+    required this.pubspecDigest,
+    required this.assets,
+    required this.colors,
+  });
+
+  bool shouldSkipGenerate(_FlutterGenBuilderState? previous) {
+    print('previous $previous');
+    if (previous == null) return false;
+    return pubspecDigest == previous.pubspecDigest &&
+        const SetEquality().equals(assets, previous.assets) &&
+        const MapEquality().equals(colors, previous.colors);
   }
 }

packages/runner/pubspec.yaml

@@ -16,6 +16,7 @@ dependencies:
   collection: '>=1.15.0 <2.0.0'
   crypto: '>=3.0.0 <4.0.0'
   glob: '>=2.0.0 <3.0.0'
+  path: '>=1.8.0 <2.0.0'
 
 dev_dependencies:
   flutter_lints: '>=2.0.1 <3.0.0'