From 980c205a667fd72c2fae2e8f7d11c085298c5ab8 Mon Sep 17 00:00:00 2001 From: Moritz Wirger Date: Fri, 28 Nov 2025 14:19:12 +0100 Subject: [PATCH 1/2] Bump source_gen to 3.1.0 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index ef1ae04..91723dd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: build: ^3.0.0 path: ^1.9.1 recase: ^4.1.0 - source_gen: ^3.0.0 + source_gen: ^3.1.0 meta: ^1.16.0 logger: ^2.6.0 stacked_shared: ^1.4.2 From f02f3a531b675f35cc00c88ea6aae263434d8659 Mon Sep 17 00:00:00 2001 From: Moritz Wirger Date: Fri, 28 Nov 2025 14:23:44 +0100 Subject: [PATCH 2/2] Replace usage of fromRuntime with typeNamed --- lib/src/generators/forms/stacked_form_generator.dart | 6 +++--- .../generators/getit/dependency_config_factory.dart | 12 ++++++------ .../getit/stacked_locator_parameter_resolver.dart | 2 +- .../router/route_config/route_config_factory.dart | 7 +++---- .../router_2/resolvers/route_config_resolver.dart | 10 +++++----- .../router_2/resolvers/router_config_resolver.dart | 6 +++--- .../resolvers/route_parameter_resolver.dart | 4 ++-- 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/lib/src/generators/forms/stacked_form_generator.dart b/lib/src/generators/forms/stacked_form_generator.dart index 1c623b9..12d3043 100644 --- a/lib/src/generators/forms/stacked_form_generator.dart +++ b/lib/src/generators/forms/stacked_form_generator.dart @@ -58,11 +58,11 @@ FieldConfig _readFieldConfig({ var fieldReader = ConstantReader(fieldConfig); bool isTextField = - fieldReader.instanceOf(const TypeChecker.fromRuntime(FormTextField)); + fieldReader.instanceOf(const TypeChecker.typeNamed(FormTextField)); bool isDateField = - fieldReader.instanceOf(const TypeChecker.fromRuntime(FormDateField)); + fieldReader.instanceOf(const TypeChecker.typeNamed(FormDateField)); bool isDropdownField = - fieldReader.instanceOf(const TypeChecker.fromRuntime(FormDropdownField)); + fieldReader.instanceOf(const TypeChecker.typeNamed(FormDropdownField)); if (isTextField) { return _readTextFieldConfig( diff --git a/lib/src/generators/getit/dependency_config_factory.dart b/lib/src/generators/getit/dependency_config_factory.dart index d9ab663..2df1e8b 100644 --- a/lib/src/generators/getit/dependency_config_factory.dart +++ b/lib/src/generators/getit/dependency_config_factory.dart @@ -64,7 +64,7 @@ class DependencyConfigFactory { // NOTE: This can be used for actual dependency inject. We do service location instead. final constructor = classElement.unnamedConstructor2; - if (dependencyReader.instanceOf(const TypeChecker.fromRuntime(Factory))) { + if (dependencyReader.instanceOf(const TypeChecker.typeNamed(Factory))) { return FactoryDependency( instanceName: instanceName, import: import!, @@ -74,7 +74,7 @@ class DependencyConfigFactory { environments: environments, ); } else if (dependencyReader - .instanceOf(const TypeChecker.fromRuntime(Singleton))) { + .instanceOf(const TypeChecker.typeNamed(Singleton))) { final ConstantReader? resolveUsing = dependencyReader.peek('resolveUsing'); final resolveObject = resolveUsing?.objectValue.toFunctionValue2(); @@ -88,7 +88,7 @@ class DependencyConfigFactory { environments: environments, resolveFunction: resolveObject?.displayName); } else if (dependencyReader - .instanceOf(const TypeChecker.fromRuntime(LazySingleton))) { + .instanceOf(const TypeChecker.typeNamed(LazySingleton))) { final ConstantReader? resolveUsing = dependencyReader.peek('resolveUsing'); final resolveObject = resolveUsing?.objectValue.toFunctionValue2(); @@ -103,7 +103,7 @@ class DependencyConfigFactory { resolveFunction: resolveObject?.displayName); } else if (dependencyReader // ignore: deprecated_member_use - .instanceOf(const TypeChecker.fromRuntime(Presolve))) { + .instanceOf(const TypeChecker.typeNamed(Presolve))) { final ConstantReader? presolveUsing = dependencyReader.peek('presolveUsing'); final presolveObject = presolveUsing?.objectValue.toFunctionValue2(); @@ -116,7 +116,7 @@ class DependencyConfigFactory { environments: environments, presolveFunction: presolveObject?.displayName); } else if (dependencyReader - .instanceOf(const TypeChecker.fromRuntime(InitializableSingleton))) { + .instanceOf(const TypeChecker.typeNamed(InitializableSingleton))) { return InitializableSingletonDependency( instanceName: instanceName, import: import!, @@ -126,7 +126,7 @@ class DependencyConfigFactory { environments: environments, ); } else if (dependencyReader - .instanceOf(const TypeChecker.fromRuntime(FactoryWithParam))) { + .instanceOf(const TypeChecker.typeNamed(FactoryWithParam))) { final Set clazzParams = {}; var params = constructor?.formalParameters; if (params?.isNotEmpty == true && constructor != null) { diff --git a/lib/src/generators/getit/stacked_locator_parameter_resolver.dart b/lib/src/generators/getit/stacked_locator_parameter_resolver.dart index 77f8663..0c8a2eb 100644 --- a/lib/src/generators/getit/stacked_locator_parameter_resolver.dart +++ b/lib/src/generators/getit/stacked_locator_parameter_resolver.dart @@ -6,7 +6,7 @@ import 'package:stacked_shared/stacked_shared.dart'; import 'dependency_config/factory_param_dependency.dart'; -const _factoryParamChecker = TypeChecker.fromRuntime(FactoryParam); +const _factoryParamChecker = TypeChecker.typeNamed(FactoryParam); class DependencyParameterResolver { final ImportResolver _importResolver; diff --git a/lib/src/generators/router/route_config/route_config_factory.dart b/lib/src/generators/router/route_config/route_config_factory.dart index fbe1d26..498a257 100644 --- a/lib/src/generators/router/route_config/route_config_factory.dart +++ b/lib/src/generators/router/route_config/route_config_factory.dart @@ -37,8 +37,7 @@ class RouteConfigFactory { }); RouteConfig fromResolver(ConstantReader stackedRoute) { - if (stackedRoute - .instanceOf(const TypeChecker.fromRuntime(CupertinoRoute))) { + if (stackedRoute.instanceOf(const TypeChecker.typeNamed(CupertinoRoute))) { return CupertinoRouteConfig( className: className, classImport: classImport, @@ -54,7 +53,7 @@ class RouteConfigFactory { parentClassName: parentClassName, ); } else if (stackedRoute - .instanceOf(const TypeChecker.fromRuntime(AdaptiveRoute))) { + .instanceOf(const TypeChecker.typeNamed(AdaptiveRoute))) { return AdaptiveRouteConfig( className: className, classImport: classImport, @@ -70,7 +69,7 @@ class RouteConfigFactory { parentClassName: parentClassName, ); } else if (stackedRoute - .instanceOf(const TypeChecker.fromRuntime(CustomRoute))) { + .instanceOf(const TypeChecker.typeNamed(CustomRoute))) { final function = stackedRoute .peek('transitionsBuilder') ?.objectValue diff --git a/lib/src/generators/router_2/resolvers/route_config_resolver.dart b/lib/src/generators/router_2/resolvers/route_config_resolver.dart index fb8d79d..d33802d 100644 --- a/lib/src/generators/router_2/resolvers/route_config_resolver.dart +++ b/lib/src/generators/router_2/resolvers/route_config_resolver.dart @@ -16,7 +16,7 @@ const TypeChecker autoRouteChecker = TypeChecker.fromUrl( 'package:stacked_shared/src/code_generation/stacked_app.dart#StackedApp', ); -const TypeChecker stackedRouteChecker = TypeChecker.fromRuntime(StackedRoute); +const TypeChecker stackedRouteChecker = TypeChecker.typeNamed(StackedRoute); const validMetaValues = [ 'String', @@ -127,19 +127,19 @@ class RouteConfigResolver { ResolvedType? customRouteBuilder; ResolvedType? transitionBuilder; int? customRouteBarrierColor; - if (stackedRoute.instanceOf(const TypeChecker.fromRuntime(MaterialRoute))) { + if (stackedRoute.instanceOf(const TypeChecker.typeNamed(MaterialRoute))) { routeType = RouteType.material; } else if (stackedRoute - .instanceOf(const TypeChecker.fromRuntime(CupertinoRoute))) { + .instanceOf(const TypeChecker.typeNamed(CupertinoRoute))) { routeType = RouteType.cupertino; cupertinoNavTitle = stackedRoute.peek('title')?.stringValue; } else if (stackedRoute - .instanceOf(const TypeChecker.fromRuntime(AdaptiveRoute))) { + .instanceOf(const TypeChecker.typeNamed(AdaptiveRoute))) { routeType = RouteType.adaptive; cupertinoNavTitle = stackedRoute.peek('cupertinoPageTitle')?.stringValue; customRouteOpaque = stackedRoute.peek('opaque')?.boolValue; } else if (stackedRoute - .instanceOf(const TypeChecker.fromRuntime(CustomRoute))) { + .instanceOf(const TypeChecker.typeNamed(CustomRoute))) { routeType = RouteType.custom; durationInMilliseconds = stackedRoute.peek('durationInMilliseconds')?.intValue; diff --git a/lib/src/generators/router_2/resolvers/router_config_resolver.dart b/lib/src/generators/router_2/resolvers/router_config_resolver.dart index 18403df..4dfd8e5 100644 --- a/lib/src/generators/router_2/resolvers/router_config_resolver.dart +++ b/lib/src/generators/router_2/resolvers/router_config_resolver.dart @@ -31,13 +31,13 @@ class RouterConfigResolver { bool? customRouteBarrierDismissible; ResolvedType? transitionBuilder; ResolvedType? customRouteBuilder; - if (stackedApp.instanceOf(const TypeChecker.fromRuntime(CupertinoRouter))) { + if (stackedApp.instanceOf(const TypeChecker.typeNamed(CupertinoRouter))) { routeType = RouteType.cupertino; } else if (stackedApp - .instanceOf(const TypeChecker.fromRuntime(AdaptiveRouter))) { + .instanceOf(const TypeChecker.typeNamed(AdaptiveRouter))) { routeType = RouteType.adaptive; } else if (stackedApp - .instanceOf(const TypeChecker.fromRuntime(CustomRouter))) { + .instanceOf(const TypeChecker.typeNamed(CustomRouter))) { routeType = RouteType.custom; durationInMilliseconds = diff --git a/lib/src/generators/router_common/resolvers/route_parameter_resolver.dart b/lib/src/generators/router_common/resolvers/route_parameter_resolver.dart index d0db36a..b49ce99 100644 --- a/lib/src/generators/router_common/resolvers/route_parameter_resolver.dart +++ b/lib/src/generators/router_common/resolvers/route_parameter_resolver.dart @@ -6,8 +6,8 @@ import 'package:stacked_generator/src/generators/router_common/resolvers/type_re import 'package:stacked_generator/utils.dart'; import 'package:stacked_shared/stacked_shared.dart'; -const _pathParamChecker = TypeChecker.fromRuntime(PathParam); -const _queryParamChecker = TypeChecker.fromRuntime(QueryParam); +const _pathParamChecker = TypeChecker.typeNamed(PathParam); +const _queryParamChecker = TypeChecker.typeNamed(QueryParam); class RouteParameterResolver { final TypeResolver _typeResolver;