From 6c9b6e239bf52d77f28dcbb6a455916e8b5e38db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malo=20L=C3=A9on?= Date: Tue, 7 Feb 2023 10:22:32 +0100 Subject: [PATCH 1/3] fix(component_copy_with_gen): copywith method takes non nullable fields too (#118) --- .../lib/src/generators/component_proxy_generator.dart | 9 +++------ packages/wyatt_component_copy_with_gen/pubspec.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/wyatt_component_copy_with_gen/lib/src/generators/component_proxy_generator.dart b/packages/wyatt_component_copy_with_gen/lib/src/generators/component_proxy_generator.dart index e9eede8b..f8d71a9b 100644 --- a/packages/wyatt_component_copy_with_gen/lib/src/generators/component_proxy_generator.dart +++ b/packages/wyatt_component_copy_with_gen/lib/src/generators/component_proxy_generator.dart @@ -17,7 +17,6 @@ import 'dart:async'; import 'package:analyzer/dart/element/element.dart'; -import 'package:analyzer/dart/element/nullability_suffix.dart'; import 'package:build/build.dart'; import 'package:source_gen/source_gen.dart'; import 'package:wyatt_component_copy_with_extension/component_copy_with_extension.dart'; @@ -61,11 +60,9 @@ class ComponentProxyGenerator generatedCode.write('${element.displayName} call({'); for (final field in element.constructors.first.parameters) { - if (field.type.nullabilitySuffix == NullabilitySuffix.question) { - generatedCode.write('${field.type.getDisplayString( - withNullability: false, - )}? ${field.displayName}, '); - } + generatedCode.write('${field.type.getDisplayString( + withNullability: false, + )}? ${field.displayName}, '); } generatedCode.write('});}'); diff --git a/packages/wyatt_component_copy_with_gen/pubspec.yaml b/packages/wyatt_component_copy_with_gen/pubspec.yaml index c878289c..d0a8a04a 100644 --- a/packages/wyatt_component_copy_with_gen/pubspec.yaml +++ b/packages/wyatt_component_copy_with_gen/pubspec.yaml @@ -12,10 +12,10 @@ dependencies: source_gen: ^1.2.7 analyzer: ^5.4.0 -wyatt_component_copy_with_extension: - git: - url: ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-packages.git - path: packages/wyatt_component_copy_with_extension + wyatt_component_copy_with_extension: + git: + url: ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-packages.git + path: packages/wyatt_component_copy_with_extension dev_dependencies: test: ^1.21.0 -- 2.47.2 From 0b27a626691cb4cc2b618dae95a8abffeeadcc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malo=20L=C3=A9on?= Date: Tue, 7 Feb 2023 10:24:00 +0100 Subject: [PATCH 2/3] fix(component_copy_with_gen): update example (#118) --- .../example/lib/custom_app_bar_example.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wyatt_component_copy_with_gen/example/lib/custom_app_bar_example.dart b/packages/wyatt_component_copy_with_gen/example/lib/custom_app_bar_example.dart index 7c69d3b3..e08015f2 100644 --- a/packages/wyatt_component_copy_with_gen/example/lib/custom_app_bar_example.dart +++ b/packages/wyatt_component_copy_with_gen/example/lib/custom_app_bar_example.dart @@ -18,11 +18,11 @@ import 'package:flutter/material.dart'; import 'package:wyatt_component_copy_with_extension/component_copy_with_extension.dart'; import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart'; -// part 'custom_app_bar_example.g.dart'; +part 'custom_app_bar_example.g.dart'; @ComponentCopyWithExtension() class CustomAppBarExample extends AppBarComponent - with $CustomAppBarExampleCWProxyImpl { + with $CustomAppBarExampleCWMixin { const CustomAppBarExample({super.title, super.key}); @override -- 2.47.2 From ff3f2008de902f0f52ff0ec4e7671fe2d45ebed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malo=20L=C3=A9on?= Date: Tue, 7 Feb 2023 10:25:58 +0100 Subject: [PATCH 3/3] fix(ui_components): generate new files after generator fixes (close #118) --- .../src/domain/entities/bottom_navigation_bar_component.g.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/wyatt_ui_components/lib/src/domain/entities/bottom_navigation_bar_component.g.dart b/packages/wyatt_ui_components/lib/src/domain/entities/bottom_navigation_bar_component.g.dart index e8963f65..9e5fdd5e 100644 --- a/packages/wyatt_ui_components/lib/src/domain/entities/bottom_navigation_bar_component.g.dart +++ b/packages/wyatt_ui_components/lib/src/domain/entities/bottom_navigation_bar_component.g.dart @@ -12,6 +12,7 @@ abstract class $BottomNavigationBarComponentCWProxy { BottomNavigationBarComponent key(Key? key); BottomNavigationBarComponent call({ void Function(BuildContext, int)? onTap, + int? currentIndex, Key? key, }); } -- 2.47.2